Misc. updates following 2to3 checks.

2 files changed, 60 insertions, 52 deletions

diff --git a/tests/test_ez_setup.py b/tests/test_ez_setup.py
index 922bd884..6dd4c055 100644
--- a/tests/test_ez_setup.py
+++ b/tests/test_ez_setup.py
@@ -27,7 +27,10 @@ class TestSetup(unittest.TestCase):
                     "--dist-dir", "%s" % self.tmpdir)
         tarball = os.listdir(self.tmpdir)[0]
         self.tarball = os.path.join(self.tmpdir, tarball)
-        import urllib2
+        try:
+            import urllib2
+        except ImportError:
+            import urllib.request as urllib2
         urllib2.urlopen = self.urlopen
 
     def tearDown(self):
diff --git a/tests/test_pkg_resources.py b/tests/test_pkg_resources.py
index 7009b4ab..b05ea44b 100644
--- a/tests/test_pkg_resources.py
+++ b/tests/test_pkg_resources.py
@@ -5,57 +5,62 @@ import zipfile
 
 import pkg_resources
 
+try:
+    unicode
+except NameError:
+    unicode = str
+
 class EggRemover(unicode):
-	def __call__(self):
-		if self in sys.path:
-			sys.path.remove(self)
-		if os.path.exists(self):
-			os.remove(self)
+    def __call__(self):
+        if self in sys.path:
+            sys.path.remove(self)
+        if os.path.exists(self):
+            os.remove(self)
 
 class TestZipProvider(object):
-	finalizers = []
-
-	@classmethod
-	def setup_class(cls):
-		"create a zip egg and add it to sys.path"
-		egg = tempfile.NamedTemporaryFile(suffix='.egg', delete=False)
-		zip_egg = zipfile.ZipFile(egg, 'w')
-		zip_info = zipfile.ZipInfo()
-		zip_info.filename = 'mod.py'
-		zip_info.date_time = 2013, 5, 12, 13, 25, 0
-		zip_egg.writestr(zip_info, 'x = 3\n')
-		zip_info = zipfile.ZipInfo()
-		zip_info.filename = 'data.dat'
-		zip_info.date_time = 2013, 5, 12, 13, 25, 0
-		zip_egg.writestr(zip_info, 'hello, world!')
-		zip_egg.close()
-		egg.close()
-
-		sys.path.append(egg.name)
-		cls.finalizers.append(EggRemover(egg.name))
-
-	@classmethod
-	def teardown_class(cls):
-		for finalizer in cls.finalizers:
-			finalizer()
-
-	def test_resource_filename_rewrites_on_change(self):
-		"""
-		If a previous call to get_resource_filename has saved the file, but
-		the file has been subsequently mutated with different file of the
-		same size and modification time, it should not be overwritten on a
-		subsequent call to get_resource_filename.
-		"""
-		import mod
-		manager = pkg_resources.ResourceManager()
-		zp = pkg_resources.ZipProvider(mod)
-		filename = zp.get_resource_filename(manager, 'data.dat')
-		assert os.stat(filename).st_mtime == 1368379500
-		f = open(filename, 'wb')
-		f.write('hello, world?')
-		f.close()
-		os.utime(filename, (1368379500, 1368379500))
-		filename = zp.get_resource_filename(manager, 'data.dat')
-		f = open(filename)
-		assert f.read() == 'hello, world!'
-		manager.cleanup_resources()
+    finalizers = []
+
+    @classmethod
+    def setup_class(cls):
+        "create a zip egg and add it to sys.path"
+        egg = tempfile.NamedTemporaryFile(suffix='.egg', delete=False)
+        zip_egg = zipfile.ZipFile(egg, 'w')
+        zip_info = zipfile.ZipInfo()
+        zip_info.filename = 'mod.py'
+        zip_info.date_time = 2013, 5, 12, 13, 25, 0
+        zip_egg.writestr(zip_info, 'x = 3\n')
+        zip_info = zipfile.ZipInfo()
+        zip_info.filename = 'data.dat'
+        zip_info.date_time = 2013, 5, 12, 13, 25, 0
+        zip_egg.writestr(zip_info, 'hello, world!')
+        zip_egg.close()
+        egg.close()
+
+        sys.path.append(egg.name)
+        cls.finalizers.append(EggRemover(egg.name))
+
+    @classmethod
+    def teardown_class(cls):
+        for finalizer in cls.finalizers:
+            finalizer()
+
+    def test_resource_filename_rewrites_on_change(self):
+        """
+        If a previous call to get_resource_filename has saved the file, but
+        the file has been subsequently mutated with different file of the
+        same size and modification time, it should not be overwritten on a
+        subsequent call to get_resource_filename.
+        """
+        import mod
+        manager = pkg_resources.ResourceManager()
+        zp = pkg_resources.ZipProvider(mod)
+        filename = zp.get_resource_filename(manager, 'data.dat')
+        assert os.stat(filename).st_mtime == 1368379500
+        f = open(filename, 'wb')
+        f.write('hello, world?')
+        f.close()
+        os.utime(filename, (1368379500, 1368379500))
+        filename = zp.get_resource_filename(manager, 'data.dat')
+        f = open(filename)
+        assert f.read() == 'hello, world!'
+        manager.cleanup_resources()