python 3 compatibility

magmax · magmax · commit 25807d4dad15 · 2014-05-23T07:39:35.000+02:00
diff --git a/tests/integration/test_directory_loader.py b/tests/integration/test_directory_loader.py
@@ -36,23 +36,23 @@ def test_load_simple_file(self):
 
         sut.load_directory(self.plugin_dir)
 
-        self.assertEqual(['Foo'], sut.plugins.keys())
+        self.assertEqual(['Foo'], list(sut.plugins.keys()))
 
     def test_ignorable_classes(self):
         self._create('foo.py', 'class Foo(object): pass')
         sut = PluginLoader()
 
         sut.load_directory(self.plugin_dir, onlyif=lambda x, y: False)
 
-        self.assertEquals({}, sut.plugins)
+        self.assertEqual({}, sut.plugins)
 
     def test_containing_directories(self):
         self._create_dir('foo')
         sut = PluginLoader()
 
         sut.load_directory(self.plugin_dir)
 
-        self.assertEquals({}, sut.plugins)
+        self.assertEqual({}, sut.plugins)
 
     def test_recursive_mode(self):
         self._create_dir('foo')
@@ -61,7 +61,7 @@ def test_recursive_mode(self):
 
         sut.load_directory(self.plugin_dir, recursive=True)
 
-        self.assertEquals(['Bazz'], sut.plugins.keys())
+        self.assertEqual(['Bazz'], list(sut.plugins.keys()))
 
     def test_recursive_mode_off(self):
         self._create_dir('foo')
@@ -70,7 +70,7 @@ def test_recursive_mode_off(self):
 
         sut.load_directory(self.plugin_dir, recursive=False)
 
-        self.assertEquals({}, sut.plugins)
+        self.assertEqual({}, sut.plugins)
 
     def test_link_recursive(self):
         os.symlink(self.plugin_dir, os.path.join(self.plugin_dir, 'foo'))
@@ -79,4 +79,4 @@ def test_link_recursive(self):
 
         sut.load_directory(self.plugin_dir, recursive=True)
 
-        self.assertEquals({}, sut.plugins)
+        self.assertEqual({}, sut.plugins)
diff --git a/tests/integration/test_file_loader.py b/tests/integration/test_file_loader.py
@@ -50,7 +50,7 @@ def test_ignorable_classes_with_variable_false(self):
 
         sut.load_file(self.plugin_file.name, onlyif=False)
 
-        self.assertEquals([], sut.plugins.keys())
+        self.assertEqual([], list(sut.plugins.keys()))
 
     def test_ignorable_classes_with_variable_true(self):
         self._write_file('class Foo(object): pass')
@@ -59,7 +59,7 @@ def test_ignorable_classes_with_variable_true(self):
 
         sut.load_file(self.plugin_file.name, onlyif=True)
 
-        self.assertItemsEqual(['__builtins__', 'Foo'], sut.plugins.keys())
+        self.assertEqual(['__builtins__', 'Foo'], list(sut.plugins.keys()))
 
     def test_parameters_for_constructor(self):
         self._write_file(
@@ -73,7 +73,7 @@ def test_parameters_for_constructor(self):
         sut.load_file(self.plugin_file.name)
 
         plugin = sut.plugins['Foo'](5)
-        self.assertEquals(5, plugin.a)
+        self.assertEqual(5, plugin.a)
 
     def test_named_parameters_for_constructor(self):
         self._write_file(
@@ -88,7 +88,7 @@ def test_named_parameters_for_constructor(self):
 
         plugin = sut.plugins['Foo'](a=5)
 
-        self.assertEquals(5, plugin.a)
+        self.assertEqual(5, plugin.a)
 
     def test_two_plugins_in_a_file(self):
         self._write_file(
@@ -102,6 +102,6 @@ def test_two_plugins_in_a_file(self):
 
         sut.load_file(self.plugin_file.name)
 
-        self.assertItemsEqual(['Foo', 'Bar'], sut.plugins.keys())
-        self.assertEquals('Foo', sut.plugins['Foo']().__class__.__name__)
-        self.assertEquals('Bar', sut.plugins['Bar']().__class__.__name__)
+        self.assertEqual(['Foo', 'Bar'], list(sut.plugins.keys()))
+        self.assertEqual('Foo', sut.plugins['Foo']().__class__.__name__)
+        self.assertEqual('Bar', sut.plugins['Bar']().__class__.__name__)
