From da5935f405b6066b428629d60684e1b0d7ade027 Mon Sep 17 00:00:00 2001
From: Thomas Leonard <talex5@gmail.com>
Date: Sun, 30 Oct 2011 11:58:38 +0000
Subject: [PATCH] Some updates for Python 3

---
 tests/basetest.py               | 4 ++--
 tests/testmodel.py              | 4 ++--
 tests/testpackagekit.py         | 8 ++++----
 zeroinstall/zerostore/unpack.py | 3 ++-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/tests/basetest.py b/tests/basetest.py
index 9804408..34bfcc9 100755
--- a/tests/basetest.py
+++ b/tests/basetest.py
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
-import sys, tempfile, os, shutil, StringIO
+import sys, tempfile, os, shutil, StringIO, imp
 import unittest
 import logging
 import warnings
@@ -173,7 +173,7 @@ class BaseTest(unittest.TestCase):
 		os.environ['XDG_CONFIG_DIRS'] = ''
 		os.environ['XDG_CACHE_HOME'] = self.cache_home
 		os.environ['XDG_CACHE_DIRS'] = self.cache_system
-		reload(basedir)
+		imp.reload(basedir)
 		assert basedir.xdg_config_home == self.config_home
 
 		os.mkdir(self.config_home, 0o700)
diff --git a/tests/testmodel.py b/tests/testmodel.py
index cfc282a..6b05757 100755
--- a/tests/testmodel.py
+++ b/tests/testmodel.py
@@ -10,7 +10,7 @@ from StringIO import StringIO
 sys.path.insert(0, '..')
 from zeroinstall.injector import model, qdom, namespaces
 
-mydir = os.path.dirname(__file__)
+mydir = os.path.dirname(os.path.abspath(__file__))
 
 class TestModel(BaseTest):
 	def testLevels(self):
@@ -164,7 +164,7 @@ class TestModel(BaseTest):
 		assert str(a) == 'foo'
 
 		b = model.ZeroInstallImplementation(i, 'foo', None)
-		b.version = [1,2,1]
+		b.version = model.parse_version("1.2.1")
 		assert b > a
 	
 	def testDownloadSource(self):
diff --git a/tests/testpackagekit.py b/tests/testpackagekit.py
index 84d4f0c..d51fee7 100755
--- a/tests/testpackagekit.py
+++ b/tests/testpackagekit.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 from basetest import BaseTest
-import sys
+import sys, imp
 import unittest
 
 sys.path.insert(0, '..')
@@ -125,7 +125,7 @@ class TestPackageKit(BaseTest):
 			sys.meta_path = [self]
 			del sys.modules['dbus']
 
-			reload(packagekit)
+			imp.reload(packagekit)
 
 			pk = packagekit.PackageKit()
 			assert pk.available == False
@@ -137,7 +137,7 @@ class TestPackageKit(BaseTest):
 			sys.modules['dbus'] = old_dbus
 
 	def testNoPackageKit(self):
-		reload(packagekit)
+		imp.reload(packagekit)
 		pk = packagekit.PackageKit()
 		assert not pk.available
 
@@ -153,7 +153,7 @@ class TestPackageKit(BaseTest):
 			'/tid/2': PackageKit05.Tid2(),
 			'/tid/3': PackageKit05.Install(),
 		}
-		reload(packagekit)
+		imp.reload(packagekit)
 		pk = packagekit.PackageKit()
 		assert pk.available
 
diff --git a/zeroinstall/zerostore/unpack.py b/zeroinstall/zerostore/unpack.py
index f2dddc3..a7098b4 100644
--- a/zeroinstall/zerostore/unpack.py
+++ b/zeroinstall/zerostore/unpack.py
@@ -294,7 +294,8 @@ def extract_rpm(stream, destdir, extract = None, start_offset = 0):
 		_extract(open(cpiopath), destdir, args)
 		# Set the mtime of every directory under 'tmp' to 0, since cpio doesn't
 		# preserve directory mtimes.
-		os.path.walk(destdir, lambda arg, dirname, names: os.utime(dirname, (0, 0)), None)
+		for root, dirs, files in os.walk(destdir):
+			os.utime(root, (0, 0))
 	finally:
 		if fd is not None:
 			os.close(fd)
-- 
2.11.4.GIT