Python 3 port

This includes a necessary dependency on python-six for its compability layer
since we are wanting to continue support for both Python 2.7.x and Python 3.x.
In addition, this will allow us to effectively phase out Python 2 support
when/if the time arises that all interested distributions have done away with
Python 2.

This port passes all unittests for both python 2.7.x and python 3.3.x

Signed-off-by: Adam Stokes <adam.stokes@ubuntu.com>

1 files changed, 4 insertions, 2 deletions

diff --git a/tests/archive_tests.py b/tests/archive_tests.py
index abdce994..9cd7bd1b 100644
--- a/tests/archive_tests.py
+++ b/tests/archive_tests.py
@@ -9,6 +9,8 @@ import shutil
 
 from sos.archive import TarFileArchive, ZipFileArchive
 
+# PYCOMPAT
+import six
 
 class ZipFileArchiveTest(unittest.TestCase):
 
@@ -66,14 +68,14 @@ class ZipFileArchiveTest(unittest.TestCase):
         self.zf.add_string('this is my content', 'tests/string_test.txt')
 
         afp = self.zf.open_file('tests/string_test.txt')
-        self.assertEquals('this is my content', afp.read())
+        self.assertEquals(six.b('this is my content'), afp.read())
 
     def test_overwrite_file(self):
         self.zf.add_string('this is my content', 'tests/string_test.txt')
         self.zf.add_string('this is my new content', 'tests/string_test.txt')
 
         afp = self.zf.open_file('tests/string_test.txt')
-        self.assertEquals('this is my new content', afp.read())
+        self.assertEquals(six.b('this is my new content'), afp.read())
 
 # Disabled as new api doesnt provide a add_link routine
 #    def test_make_link(self):