Closes dpath-maintainers#4: dpath.path.validate chokes on integer keys, need to convert keys to string before comparing them to the separator or the regex

Andrew Kesterson · Andrew Kesterson · commit 853d1c8169e2 · 2013-05-14T12:37:27.000-04:00
diff --git a/dpath/path.py b/dpath/path.py
@@ -7,17 +7,18 @@
 def validate(path, separator="/", regex=None):
     validated = []
     for key in path:
-        if (separator and (separator in key)):
+        strkey = str(key)
+        if (separator and (separator in strkey)):
             raise dpath.exceptions.InvalidKeyName("{} at {} contains the separator {}"
-                                                  "".format(key,
+                                                  "".format(strkey,
                                                             separator.join(validated),
                                                             separator))
-        elif (regex and (not regex.findall(key))):
+        elif (regex and (not regex.findall(strkey))):
             raise dpath.exceptions.InvalidKeyName("{} at {} does not match the expression {}"
-                                                  "".format(key,
+                                                  "".format(strkey,
                                                             separator.join(validated),
                                                             regex.pattern))
-        validated.append(key)
+        validated.append(strkey)
 
 def paths(obj, dirs=True, leaves=True, path=[], skip=False, separator="/"):
     """Yield all paths of the object.
diff --git a/tests/test_path_paths.py b/tests/test_path_paths.py
@@ -10,3 +10,6 @@ def test_path_paths_invalid_keyname():
         }
     for x in dpath.path.paths(tdict):
         pass
+
+def test_path_paths_int_keys():
+    dpath.path.validate(['I', 'am', 'path', 0, 'of', 2])

Original file line number	Diff line number	Diff line change
`@@ -10,3 +10,6 @@ def test_path_paths_invalid_keyname():`
`10`	`10`	`}`
`11`	`11`	`for x in dpath.path.paths(tdict):`
`12`	`12`	`pass`
	`13`	`+`
	`14`	`+def test_path_paths_int_keys():`
	`15`	`+ dpath.path.validate(['I', 'am', 'path', 0, 'of', 2])`