Added support for Python 3

alangibson · alangibson · commit 8cbf5352ca67 · 2014-02-03T11:38:52.000+01:00
diff --git a/dpath/__init__.py b/dpath/__init__.py
@@ -0,0 +1,5 @@
+import sys
+
+# Python version flags for Python 3 support
+PY2 = ( sys.version_info.major == 2 )
+PY3 = ( sys.version_info.major == 3 )  
diff --git a/dpath/path.py b/dpath/path.py
@@ -1,3 +1,4 @@
+from dpath import PY3
 import dpath.exceptions
 import re
 import fnmatch
@@ -76,8 +77,17 @@ def paths(obj, dirs=True, leaves=True, path=[], skip=False, separator="/"):
 
     """
     if isinstance(obj, dict):
-        for (k, v) in obj.iteritems():
-            if issubclass(k.__class__, (basestring)) and skip and k[0] == '+':
+
+        # Python 3 support        
+        if PY3:
+            iteritems = obj.items()
+            string_class = str
+        else: # Default to PY2
+            iteritems = obj.iteritems()
+            string_class = basestring
+        
+        for (k, v) in iteritems:
+            if issubclass(k.__class__, (string_class)) and skip and k[0] == '+':
                 continue
             newpath = path + [[k, v.__class__]]
             validate(newpath, separator=separator)
@@ -125,7 +135,11 @@ def match(path, glob):
             ss_glob = glob[:ss] + glob[ss + 1:]
 
     if path_len == len(ss_glob):
-        return all(map(fnmatch.fnmatch, map(str, paths_only(path)), map(str, ss_glob)))
+        # Python 3 support
+        if PY3:
+            return all(map(fnmatch.fnmatch, list(map(str, paths_only(path))), list(map(str, ss_glob))))
+        else: # Default to Python 2
+            return all(map(fnmatch.fnmatch, map(str, paths_only(path)), map(str, ss_glob)))
 
     return False
 
diff --git a/dpath/util.py b/dpath/util.py
@@ -38,7 +38,7 @@ def delete(obj, glob, separator="/", afilter=None):
             prev = cur
             try:
                 cur = cur[item[0]]
-            except AttributeError, e:
+            except AttributeError as e:
                 # This only happens when we delete X/Y and the next
                 # item in the paths is X/Y/Z
                 pass
diff --git a/setup.py b/setup.py
@@ -37,6 +37,7 @@
             'License :: OSI Approved :: MIT License',
             'Natural Language :: English',
             'Programming Language :: Python :: 2.7',
+            'Programming Language :: Python :: 3',
             'Topic :: Software Development :: Libraries :: Python Modules',
         ],
     )
diff --git a/tests/test_util_merge.py b/tests/test_util_merge.py
@@ -16,7 +16,7 @@ def test_merge_typesafe_and_separator():
         }
     try:
         dpath.util.merge(dst, src, flags=(dpath.util.MERGE_ADDITIVE | dpath.util.MERGE_TYPESAFE), separator=";")
-    except TypeError, e:
+    except TypeError as e:
         assert(str(e).endswith("dict;integer"))
         return
     raise Exception("MERGE_TYPESAFE failed to raise an exception when merging between str and int!")
diff --git a/tests/test_util_set.py b/tests/test_util_set.py
@@ -42,7 +42,7 @@ def afilter(x):
             }
         }
     dpath.util.set(dict, '/a/*', 31337, afilter=afilter)
-    print dict
+    print(dict)
     assert (dict['a']['b'] == 0)
     assert (dict['a']['c'] == 1)
     assert (dict['a']['d'] == 31337)

Original file line number	Diff line number	Diff line change
`@@ -37,6 +37,7 @@`
`37`	`37`	`'License :: OSI Approved :: MIT License',`
`38`	`38`	`'Natural Language :: English',`
`39`	`39`	`'Programming Language :: Python :: 2.7',`
	`40`	`+ 'Programming Language :: Python :: 3',`
`40`	`41`	`'Topic :: Software Development :: Libraries :: Python Modules',`
`41`	`42`	`],`
`42`	`43`	`)`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ def test_merge_typesafe_and_separator():`
`16`	`16`	`}`
`17`	`17`	`try:`
`18`	`18`	`dpath.util.merge(dst, src, flags=(dpath.util.MERGE_ADDITIVE \| dpath.util.MERGE_TYPESAFE), separator=";")`
`19`		`- except TypeError, e:`
	`19`	`+ except TypeError as e:`
`20`	`20`	`assert(str(e).endswith("dict;integer"))`
`21`	`21`	`return`
`22`	`22`	`raise Exception("MERGE_TYPESAFE failed to raise an exception when merging between str and int!")`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ def afilter(x):`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`dpath.util.set(dict, '/a/*', 31337, afilter=afilter)`
`45`		`- print dict`
	`45`	`+ print(dict)`
`46`	`46`	`assert (dict['a']['b'] == 0)`
`47`	`47`	`assert (dict['a']['c'] == 1)`
`48`	`48`	`assert (dict['a']['d'] == 31337)`