Merge branch 'refs/heads/develop'

2014-02-16 09:43:03 +01:00
parent 68d826ca1c 886a271d19
commit b9a724c8bb
1 changed files with 4 additions and 1 deletions
@@ -44,7 +44,10 @@ def dictToList(params):
        new = {}
        for x, value in params.items():
            try:
-                new_value = [dictToList(value[k]) for k in sorted(value.keys(), cmp = natcmp)]
+                convert = lambda text: int(text) if text.isdigit() else text.lower()
+                alphanum_key = lambda key: [convert(c) for c in re.split('([0-9]+)', key)]
+                sorted_keys = sorted(value.keys(), key = alphanum_key)
+                new_value = [dictToList(value[k]) for k in sorted_keys]
            except:
                new_value = value