redefine assertIsNone if using python<2.7.

Bauble · Jan 3, 2015 · d19545b · d19545b
1 parent e2b4318
commit d19545b
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/bauble/test/__init__.py b/bauble/test/__init__.py
@@ -67,3 +67,10 @@ def tearDown(self):
         db.metadata.drop_all(bind=db.engine)
         bauble.pluginmgr.commands.clear()
         pluginmgr.plugins.clear()
+
+    # assertIsNone is not available before 2.7
+    import sys
+    if sys.version_info[:2] < (2, 7):
+        def assertIsNone(self, item):
+            self.assertTrue(item is None)
+
diff --git a/bauble/test/test_search.py b/bauble/test/test_search.py
@@ -241,12 +241,7 @@ def test_look_for_wrong_strategy(self):
 
         mapper_search = search.get_strategy('NotExisting')
 
-        # assertIsNone is not available before 2.7
-        import sys
-        if sys.version_info[:2] <= (2, 6):
-            self.assertTrue(mapper_search is None)
-        elif sys.version_info[:2] >= (2, 7):
-            self.assertIsNone(mapper_search)
+        self.assertIsNone(mapper_search)
 
     def test_search_by_values(self):
         """