[Checkins] SVN: manuel/branches/elro-test-count/ optional unittest2 usage

[Laurence Rowe]

Log message for revision 115679:
  optional unittest2 usage

Changed:
  U   manuel/branches/elro-test-count/buildout.cfg
  U   manuel/branches/elro-test-count/setup.py
  U   manuel/branches/elro-test-count/src/manuel/testing.py
  U   manuel/branches/elro-test-count/src/manuel/tests.py

-=-
Modified: manuel/branches/elro-test-count/buildout.cfg
===================================================================
--- manuel/branches/elro-test-count/buildout.cfg	2010-08-14 15:25:34 UTC (rev 115678)
+++ manuel/branches/elro-test-count/buildout.cfg	2010-08-14 15:26:09 UTC (rev 115679)
@@ -11,7 +11,7 @@
 
 [test]
 recipe = zc.recipe.testrunner
-eggs = manuel [tests]
+eggs = manuel [tests, unittest2]
 defaults = '--tests-pattern tests --exit-with-status -1 --auto-color'.split()
 working-directory = .
 
@@ -63,3 +63,4 @@
 zope.interface = 3.5.1
 zope.testing = 3.9.1
 zope.testrunner = 4.0.0b2
+unittest2 = 0.5.1

Modified: manuel/branches/elro-test-count/setup.py
===================================================================
--- manuel/branches/elro-test-count/setup.py	2010-08-14 15:25:34 UTC (rev 115678)
+++ manuel/branches/elro-test-count/setup.py	2010-08-14 15:26:09 UTC (rev 115679)
@@ -33,7 +33,8 @@
     description= 'Manuel lets you build tested documentation.',
     license='ZPL',
     extras_require={
-        'tests': ['zope.testing']
+        'tests': ['zope.testing'],
+        'unittest2': ['unittest2'],
         },
     install_requires=[
         'setuptools',

Modified: manuel/branches/elro-test-count/src/manuel/testing.py
===================================================================
--- manuel/branches/elro-test-count/src/manuel/testing.py	2010-08-14 15:25:34 UTC (rev 115678)
+++ manuel/branches/elro-test-count/src/manuel/testing.py	2010-08-14 15:26:09 UTC (rev 115679)
@@ -4,7 +4,10 @@
 import manuel
 import os.path
 import sys
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import zope.testrunner.exceptions
 
 __all__ = ['TestSuite']

Modified: manuel/branches/elro-test-count/src/manuel/tests.py
===================================================================
--- manuel/branches/elro-test-count/src/manuel/tests.py	2010-08-14 15:25:34 UTC (rev 115678)
+++ manuel/branches/elro-test-count/src/manuel/tests.py	2010-08-14 15:26:09 UTC (rev 115679)
@@ -7,7 +7,10 @@
 import manuel.testing
 import os.path
 import re
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 import zope.testing.renormalizing
 
 doctest = manuel.absolute_import('doctest')