Merge lp:~javier.collado/mago/unittest-trick into lp:mago

[Javier Collado]

Right no the mago.case module checks the python interpreter version and imports unittest2 as unittest when it's lower than 2.7.

While this solution works well for this module, there are other modules that might use unittest (mago.core does) and also all test cases (for example, the ones in lp:~mago-contributors/mago/mago-testsuite).

Since it would be too verbose to add the same kind of check to every module and test that needs unittest, this branch takes another approach. It does the check the first thing when mago module is imported and then sets sys.modules['unittest'] to the right module. This way, there's no need for more checks and the right module is imported everywhere (as long as reload isn't used).

[James Tatum (jtatum)]

That's clever!

review: Approve

=== modified file 'mago/__init__.py'
--- mago/__init__.py	2011-01-07 08:22:59 +0000
+++ mago/__init__.py	2011-02-17 14:32:54 +0000
@@ -16,6 +16,20 @@
 
 """Testing framework extensions for desktop testing"""
 
+import sys
+if sys.version_info < (2, 7):
+    try:
+        import unittest2 as unittest
+    except ImportError:
+        print """unittest2 is required. Install the package python-unittest2.\nExiting..."""
+        sys.exit(1)
+else:
+    import unittest
+
+# Make sure that any other modules
+# that import unittest will get the right version
+sys.modules['unittest'] = unittest
+
 from mago.core import main, TestResult, TextTestRunner, magoConfig
 from mago.case import TestCase
 from mago.config import get_config

=== modified file 'mago/case.py'
--- mago/case.py	2011-02-05 22:48:24 +0000
+++ mago/case.py	2011-02-17 14:32:54 +0000
@@ -15,17 +15,7 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
 
 """Main TestCase class"""
-
-import sys
-if sys.version_info < (2, 7):
-    try:
-        import unittest2 as unittest
-    except ImportError:
-        print """unittest2 is required. Install the package python-unittest2.\nExiting..."""
-        sys.exit(1)
-else:
-    import unittest
-    
+import unittest
 from mago.application import TestApplication
 from mago.config import get_config