From 15dd8b0206257eb2dbfccbad193e8525f8971001 Mon Sep 17 00:00:00 2001
From: Christophe de Vienne <cdevienne@gmail.com>
Date: Mon, 20 Feb 2012 11:37:46 +0100
Subject: [PATCH] Fix nested dict/list structures

---
 wsme/protocols/commons.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/wsme/protocols/commons.py b/wsme/protocols/commons.py
index cc108eb..7690d6c 100644
--- a/wsme/protocols/commons.py
+++ b/wsme/protocols/commons.py
@@ -65,7 +65,7 @@ def array_from_params(datatype, params, path):
             from_param(datatype[0], value) for value in params.getall(path)]
     else:
         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():
             m = r.match(p)
@@ -86,7 +86,7 @@ def array_from_params(datatype, params, path):
 def dict_from_params(datatype, params, path):
 
     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():
         m = r.match(p)