Python 3 compatibility

.gitignore

@@ -29,3 +29,4 @@ MANIFEST
 .coverage
 .pythoscope/
 htmlcov/
+.tox

README

@@ -3,4 +3,9 @@ pathtools
 
 Pattern matching and various utilities for file systems paths.
 
+Tests
+=====
+To run the test suite, run the following in the project directory:
 
+    pip install tox
+    tox

pathtools/path.py

@@ -73,7 +73,7 @@ def walk(path, topdown=topdown, followlinks=followlinks):
             try:
                 yield next(os.walk(path, topdown=topdown, followlinks=followlinks))
             except NameError:
-                yield os.walk(path, topdown=topdown, followlinks=followlinks).next() #IGNORE:E1101
+                yield next(os.walk(path, topdown=topdown, followlinks=followlinks)) #IGNORE:E1101
     return walk
 
 

pathtools/patterns.py

@@ -111,7 +111,7 @@ def _match_path(pathname,
         >>> _match_path("/users/gorakhargosh/FOOBAR.PY", ["*.py"], ["*.PY"], False)
         Traceback (most recent call last):
             ...
-        ValueError: conflicting patterns `set(['*.py'])` included and excluded
+        ValueError: conflicting patterns `['*.py']` included and excluded
     """
     if not case_sensitive:
         included_patterns = set(map(_string_lower, included_patterns))
@@ -122,7 +122,7 @@ def _match_path(pathname,
     common_patterns = included_patterns & excluded_patterns
     if common_patterns:
         raise ValueError('conflicting patterns `%s` included and excluded'\
-                         % common_patterns)
+                         % list(common_patterns))
     return (match_path_against(pathname, included_patterns, case_sensitive)\
             and not match_path_against(pathname, excluded_patterns,
                                        case_sensitive))
@@ -167,7 +167,7 @@ def match_path(pathname,
         >>> match_path("/users/gorakhargosh/FOOBAR.PY", ["*.py"], ["*.PY"], False)
         Traceback (most recent call last):
             ...
-        ValueError: conflicting patterns `set(['*.py'])` included and excluded
+        ValueError: conflicting patterns `['*.py']` included and excluded
     """
     included = ["*"] if included_patterns is None else included_patterns
     excluded = [] if excluded_patterns is None else excluded_patterns

pathtools/version.py

@@ -23,8 +23,8 @@
 # When updating this version number, please update the
 # ``docs/source/global.rst.inc`` file as well.
 VERSION_MAJOR = 0
-VERSION_MINOR = 1
-VERSION_BUILD = 1
+VERSION_MINOR = 2
+VERSION_BUILD = 0
 VERSION_INFO = (VERSION_MAJOR, VERSION_MINOR, VERSION_BUILD)
 VERSION_STRING = "%d.%d.%d" % VERSION_INFO
 

scripts/bootstrap.py

@@ -69,12 +69,12 @@
 except ImportError:
     ez = {}
     if USE_DISTRIBUTE:
-        exec urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
-                         ).read() in ez
+        exec(urllib2.urlopen('http://python-distribute.org/distribute_setup.py'
+                         ).read(), ez)
         ez['use_setuptools'](to_dir=tmpeggs, download_delay=0, no_fake=True)
     else:
-        exec urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
-                             ).read() in ez
+        exec(urllib2.urlopen('http://peak.telecommunity.com/dist/ez_setup.py'
+                             ).read(), ez)
         ez['use_setuptools'](to_dir=tmpeggs, download_delay=0)
 
     if to_reload:

scripts/nosy.py

@@ -66,7 +66,7 @@ def walk(_path):
             try:
                 return next(os.walk(_path))
             except NameError:
-                return os.walk(_path).next()
+                return next(os.walk(_path))
     for root, directories, filenames in walk(pathname):
         yield root
         for directory in directories:

setup.py

@@ -57,6 +57,10 @@ def read_file(filename):
           'Topic :: Software Development :: Libraries',
           'Topic :: System :: Filesystems',
           'Topic :: Utilities',
+          'Programming Language :: Python :: 2',
+          'Programming Language :: Python :: 2.7',
+          'Programming Language :: Python :: 3',
+          'Programming Language :: Python :: 3.5',
           ],
       packages=['pathtools']
       )

tox.ini

@@ -0,0 +1,9 @@
+[tox]
+envlist = py27,py35
+
+[testenv]
+usedevelop = True
+commands =
+  python {toxinidir}/tests/run_tests.py
+deps =
+    nose