x/wsme
Code Issues Proposed changes

Fix nested dict/list structures

Browse Source
This commit is contained in:
Christophe de Vienne 2012-02-20 11:37:46 +01:00
parent 06b41a7207
commit 15dd8b0206
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wsme/protocols/commons.py
View File

@ -65,7 +65,7 @@ def array_from_params(datatype, params, path):
from_param(datatype[0], value) for value in params.getall(path)] from_param(datatype[0], value) for value in params.getall(path)]
else: else:
indexes = set() indexes = set()
r = re.compile('^%s\[(?P<index>\d+)\]' % path) r = re.compile('^%s\[(?P<index>\d+)\]' % re.escape(path))
for p in params.keys(): for p in params.keys():
m = r.match(p) m = r.match(p)
@ -86,7 +86,7 @@ def array_from_params(datatype, params, path):
def dict_from_params(datatype, params, path): def dict_from_params(datatype, params, path):
keys = set() keys = set()
r = re.compile('^%s\[(?P<key>\w+)\]' % path) r = re.compile('^%s\[(?P<key>[a-zA-Z0-9_\.]+)\]' % re.escape(path))
for p in params.keys(): for p in params.keys():
m = r.match(p) m = r.match(p)