Use unittest2 module instead of unittest

Required by CentOS.

Signed-off-by: Markus Lehtonen <markus.lehtonen@linux.intel.com>

diff --git a/functional_tests/doc_tests/test_issue119/test_zeronine.py b/functional_tests/doc_tests/test_issue119/test_zeronine.py
index 6a4f450d5559b5a3c1655e081f3e828c985fe7fb..fa76c03cc3acea1815d01bbb45347ebe65aa1d56 100644 (file)
--- a/functional_tests/doc_tests/test_issue119/test_zeronine.py
+++ b/functional_tests/doc_tests/test_issue119/test_zeronine.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 from nose.plugins import Plugin
 from nose.plugins.plugintest import PluginTester
 from nose.plugins.manager import ZeroNinePlugin

diff --git a/functional_tests/doc_tests/test_issue145/support/package1/test_module.py b/functional_tests/doc_tests/test_issue145/support/package1/test_module.py
index 0c5ac7880319bd92a9a7281b2b72c19d535bd1ae..adbab34306787df0b371489e8e2167d5e18bdae4 100644 (file)
--- a/functional_tests/doc_tests/test_issue145/support/package1/test_module.py
+++ b/functional_tests/doc_tests/test_issue145/support/package1/test_module.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 
 def test_function():
     pass

diff --git a/functional_tests/doc_tests/test_selector_plugin/support/tests/testlib.py b/functional_tests/doc_tests/test_selector_plugin/support/tests/testlib.py
index 92c4f96ac27392633dae3ff5d76b12b5d49748d6..32b2bd96aefedfec87d578c99ead100c8b6b6a53 100644 (file)
--- a/functional_tests/doc_tests/test_selector_plugin/support/tests/testlib.py
+++ b/functional_tests/doc_tests/test_selector_plugin/support/tests/testlib.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 
 class Base(unittest.TestCase):
     """Use this base class for all tests.

diff --git a/functional_tests/support/att/test_attr.py b/functional_tests/support/att/test_attr.py
index 20e1e493484a605cf15cd9c8ae434f93f4d9d088..3e4fea285ad985d955c62fbcba30ae05fc8ea334 100644 (file)
--- a/functional_tests/support/att/test_attr.py
+++ b/functional_tests/support/att/test_attr.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 
 def test_one():
     pass

diff --git a/functional_tests/support/idp/tests.py b/functional_tests/support/idp/tests.py
index fc582786dd4cd3f09c56fbaba02bac103d799b55..977f3d79ff0e554f3e048015e9ebcb49f835c3a7 100644 (file)
--- a/functional_tests/support/idp/tests.py
+++ b/functional_tests/support/idp/tests.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 
 def test_a():
     pass

diff --git a/functional_tests/support/ltftc/tests.py b/functional_tests/support/ltftc/tests.py
index 02208a12083ddce5a31f87c27a466706fc2116bd..79b8d8856cdd12b7f32668c3afebc5706704d70c 100644 (file)
--- a/functional_tests/support/ltftc/tests.py
+++ b/functional_tests/support/ltftc/tests.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 
 class Tests(unittest.TestCase):
 

diff --git a/functional_tests/support/package1/tests/test_example_function.py b/functional_tests/support/package1/tests/test_example_function.py
index d74f2a5c3b2b2031e85820bcf30e786afb5ae8b6..2ace73c0a87a2e9ea4e1ea2e784f035087929d41 100644 (file)
--- a/functional_tests/support/package1/tests/test_example_function.py
+++ b/functional_tests/support/package1/tests/test_example_function.py
@@ -1,5 +1,5 @@
 import example
-import unittest
+import unittest2 as unittest
 
 class TestExampleFunction_TestCase(unittest.TestCase):
     def test_times_two(self):

diff --git a/functional_tests/support/twist/test_twisted.py b/functional_tests/support/twist/test_twisted.py
index d6c57c2b4d2bc243d5334dc207029b54521d95f9..ecf51dc6a546d8e6a8b0eec4cb5a7292f0ea50bd 100644 (file)
--- a/functional_tests/support/twist/test_twisted.py
+++ b/functional_tests/support/twist/test_twisted.py
@@ -1,4 +1,4 @@
-from twisted.trial import unittest
+from twisted.trial import unittest2 as unittest
 
 class TestTwisted(unittest.TestCase):
 

diff --git a/functional_tests/support/xunit/test_xunit_as_suite.py b/functional_tests/support/xunit/test_xunit_as_suite.py
index ec256b555576e5bbdb7350959d254df6f1aae3f4..0551e12c1a68a0a8687e278f0d5d2125c088a434 100644 (file)
--- a/functional_tests/support/xunit/test_xunit_as_suite.py
+++ b/functional_tests/support/xunit/test_xunit_as_suite.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 import sys
 from nose.exc import SkipTest
-import unittest
+import unittest2 as unittest
 
 class TestForXunit(unittest.TestCase):
 

diff --git a/functional_tests/test_attribute_plugin.py b/functional_tests/test_attribute_plugin.py
index f62594efd64d4d47f8be61122d1591cbc3a5ab04..a06e44d97e75c609c4aea584637fd848306e5dce 100644 (file)
--- a/functional_tests/test_attribute_plugin.py
+++ b/functional_tests/test_attribute_plugin.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.plugins.attrib import AttributeSelector
 from nose.plugins import PluginTester
 

diff --git a/functional_tests/test_buggy_generators.py b/functional_tests/test_buggy_generators.py
index 9e6e16831ae8cfc21a2224ae6ef7b6a1db647e93..9b12ccaab8e37d9623360590c4d4c623be304b37 100644 (file)
--- a/functional_tests/test_buggy_generators.py
+++ b/functional_tests/test_buggy_generators.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 from cStringIO import StringIO
 from nose.core import TestProgram
 from nose.config import Config

diff --git a/functional_tests/test_cases.py b/functional_tests/test_cases.py
index 99b907152e11c2a640f90000422c55e1ff2e967f..d8d138698fa6e9777db374d471caf476a68e59b1 100644 (file)
--- a/functional_tests/test_cases.py
+++ b/functional_tests/test_cases.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose import case
 from nose.plugins import Plugin, PluginManager

diff --git a/functional_tests/test_collector.py b/functional_tests/test_collector.py
index c3b9dca458f1e69a9a442154ece4a796d3c2f512..9feccf9b6647f46fee4994ed050e52f344328f6e 100644 (file)
--- a/functional_tests/test_collector.py
+++ b/functional_tests/test_collector.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 import warnings
 from cStringIO import StringIO
 from nose.result import _TextTestResult

diff --git a/functional_tests/test_commands.py b/functional_tests/test_commands.py
index 682af0487db254a8fd82635302690528efd55f92..92e0e9a745b1cc435f82778dd0c3160465538cd1 100644 (file)
--- a/functional_tests/test_commands.py
+++ b/functional_tests/test_commands.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.plugins.skip import SkipTest
 from nose import commands
 from StringIO import StringIO

diff --git a/functional_tests/test_config_files.py b/functional_tests/test_config_files.py
index 5f18f3ac5c18c5a17c974b671e1cefc1ba1ab2d8..ef5473ca7eb2cdba398ab20c01707494bb5815ba 100644 (file)
--- a/functional_tests/test_config_files.py
+++ b/functional_tests/test_config_files.py
@@ -1,6 +1,6 @@
 import logging
 import os
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 
 support = os.path.join(os.path.dirname(__file__), 'support')

diff --git a/functional_tests/test_doctest_plugin.py b/functional_tests/test_doctest_plugin.py
index c91ecc521a443e6d74ddf670c1d15f2dd79062f9..e0d67c6dd120ff0197152a66a2bc85439ddc59af 100644 (file)
--- a/functional_tests/test_doctest_plugin.py
+++ b/functional_tests/test_doctest_plugin.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 from nose.plugins.doctests import Doctest
 from nose.plugins import PluginTester
 

diff --git a/functional_tests/test_failuredetail_plugin.py b/functional_tests/test_failuredetail_plugin.py
index 284cf4930b60e5dfe0fd83203991393bfb44995b..627ae076b6b18937b7de90312218699165078d6e 100644 (file)
--- a/functional_tests/test_failuredetail_plugin.py
+++ b/functional_tests/test_failuredetail_plugin.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.plugins.failuredetail import FailureDetail
 from nose.plugins.capture import Capture
 from nose.plugins import PluginTester

diff --git a/functional_tests/test_id_plugin.py b/functional_tests/test_id_plugin.py
index cc8a3081852f6f7bf661217731283def2680bcb9..5ea75256bce4cf514a2af118e04f61893d2bac29 100644 (file)
--- a/functional_tests/test_id_plugin.py
+++ b/functional_tests/test_id_plugin.py
@@ -2,7 +2,7 @@ import os
 import re
 import sys
 import tempfile
-import unittest
+import unittest2 as unittest
 
 from nose.plugins import PluginTester
 from nose.plugins.builtin import Doctest

diff --git a/functional_tests/test_importer.py b/functional_tests/test_importer.py
index c24fdcfaa37586667c8318eb6776d1204e6b7822..8b7367b34fe9c7f948e9b4695aef118c7c50904a 100644 (file)
--- a/functional_tests/test_importer.py
+++ b/functional_tests/test_importer.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.importer import Importer
 
 

diff --git a/functional_tests/test_isolate_plugin.py b/functional_tests/test_isolate_plugin.py
index 087dcaa456d37f3db20e6c88b0807f543be13eda..bc1970197571ea70c83abf4919a7d8545c47a768 100644 (file)
--- a/functional_tests/test_isolate_plugin.py
+++ b/functional_tests/test_isolate_plugin.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.plugins.isolate import IsolationPlugin
 from nose.plugins import PluginTester
 

diff --git a/functional_tests/test_issue_072.py b/functional_tests/test_issue_072.py
index 3848f6f14cfe99c7ffd6422c57e96918376add73..b1c49934ebf828a294ca9a682edc05ef96ada5b1 100644 (file)
--- a/functional_tests/test_issue_072.py
+++ b/functional_tests/test_issue_072.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 
 from nose.plugins import PluginTester
 from nose.plugins.builtin import FailureDetail, Capture

diff --git a/functional_tests/test_issue_082.py b/functional_tests/test_issue_082.py
index 06fa019cdb013e8767becddef5764ff95a4df8cd..529efbf0bdacc332098d10e5880249ef9ca8ed06 100644 (file)
--- a/functional_tests/test_issue_082.py
+++ b/functional_tests/test_issue_082.py
@@ -5,7 +5,7 @@ try:
 except ImportError:
     from StringIO import StringIO
 import sys
-import unittest
+import unittest2 as unittest
 
 from nose.plugins import Plugin, PluginTester
 from nose.plugins.builtin import FailureDetail, Capture, Doctest

diff --git a/functional_tests/test_load_tests_from_test_case.py b/functional_tests/test_load_tests_from_test_case.py
index 42f8563d6b6d1055ab5ea09930405e957fd82466..a4cf504f73955e1a329014bd636484918fc78cdf 100644 (file)
--- a/functional_tests/test_load_tests_from_test_case.py
+++ b/functional_tests/test_load_tests_from_test_case.py
@@ -2,7 +2,7 @@
 Tests that plugins can override loadTestsFromTestCase
 """
 import os
-import unittest
+import unittest2 as unittest
 from nose import loader
 from nose.plugins import PluginTester
 from nose.plugins.base import Plugin

diff --git a/functional_tests/test_loader.py b/functional_tests/test_loader.py
index 6f73559629b69668759c2da6d35e3dcefdd5d294..96a105e54042e5a5370b10cd4a57bc96cb41f301 100644 (file)
--- a/functional_tests/test_loader.py
+++ b/functional_tests/test_loader.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from difflib import ndiff
 from cStringIO import StringIO
 
@@ -14,7 +14,7 @@ try:
     # 2.7+
     from unittest.runner import _WritelnDecorator
 except ImportError:
-    from unittest import _WritelnDecorator
+    from unittest2 import _WritelnDecorator
 
 support = os.path.abspath(os.path.join(os.path.dirname(__file__), 'support'))
 

diff --git a/functional_tests/test_namespace_pkg.py b/functional_tests/test_namespace_pkg.py
index 2db051ecb532bc7bdf98f8071974c4c17bb82132..ffeef6f3ee1cbc70714521f1918c9fc3985709af 100644 (file)
--- a/functional_tests/test_namespace_pkg.py
+++ b/functional_tests/test_namespace_pkg.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from cStringIO import StringIO
 from nose.core import TestProgram
 from test_program import TestRunner

diff --git a/functional_tests/test_plugin_api.py b/functional_tests/test_plugin_api.py
index c508dedbc12f00c1f702836fb7e0a3383011f925..5caf3a13c6a3403231d1f8f252f6807b14e0eef0 100644 (file)
--- a/functional_tests/test_plugin_api.py
+++ b/functional_tests/test_plugin_api.py
@@ -4,7 +4,7 @@ test plugins that implement one or more hooks for testing.
 """
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.plugins import Plugin, PluginTester
 
 support = os.path.join(os.path.dirname(__file__), 'support')

diff --git a/functional_tests/test_plugins.py b/functional_tests/test_plugins.py
index eff6c7a4f381b8881dfd47c11cbdccdf85f8dac4..bdd04d16643224a13fea8d59f6fd25c8ce512fb9 100644 (file)
--- a/functional_tests/test_plugins.py
+++ b/functional_tests/test_plugins.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose.core import TestProgram
 

diff --git a/functional_tests/test_plugintest.py b/functional_tests/test_plugintest.py
index 7d1a65b19b584c0ef136c92832e19d8d93c8d7d4..b0bfba4afab1bbb0a2da4394f44e704119f73b02 100644 (file)
--- a/functional_tests/test_plugintest.py
+++ b/functional_tests/test_plugintest.py
@@ -1,5 +1,5 @@
 
-import unittest, os
+import unittest2 as unittest, os
 from nose.plugins import PluginTester, Plugin
 from nose.tools import eq_
 from cStringIO import StringIO

diff --git a/functional_tests/test_program.py b/functional_tests/test_program.py
index bb638187284918ab5d2f182be338ca040c8f7ef6..f1985a68aad3dcd75b90dbfa633011ee87ae8f81 100644 (file)
--- a/functional_tests/test_program.py
+++ b/functional_tests/test_program.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 from cStringIO import StringIO
 from nose import SkipTest
 from nose.core import TestProgram

diff --git a/functional_tests/test_result.py b/functional_tests/test_result.py
index 72060202e26f883ac1a116def11458524781ea69..00aba5f61a766827085b684e09129725748d2740 100644 (file)
--- a/functional_tests/test_result.py
+++ b/functional_tests/test_result.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from cStringIO import StringIO
 from nose.config import Config
 from nose.core import TestProgram

diff --git a/functional_tests/test_selector.py b/functional_tests/test_selector.py
index 6282ac451c75d703960ff6f852e34a5d2b978978..ad008974896ab1100188ffdc87b7f3c656a03fdf 100644 (file)
--- a/functional_tests/test_selector.py
+++ b/functional_tests/test_selector.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 from nose.selector import Selector, TestAddress
 
 support = os.path.abspath(os.path.join(os.path.dirname(__file__), 'support'))

diff --git a/functional_tests/test_skip_pdb_interaction.py b/functional_tests/test_skip_pdb_interaction.py
index 20c5f789108667ce8003a6548293898906f9fd7b..be2b27bbc6abc92b630dbea0a984b45c8d839371 100644 (file)
--- a/functional_tests/test_skip_pdb_interaction.py
+++ b/functional_tests/test_skip_pdb_interaction.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 from nose import case
 from nose.config import Config
 from nose.plugins import debug

diff --git a/functional_tests/test_success.py b/functional_tests/test_success.py
index 760a7d1a2da546546e2fa216bce92afdaeb324bf..4f70eee802c2bc68091fe00507a73bb4e6ea54ac 100644 (file)
--- a/functional_tests/test_success.py
+++ b/functional_tests/test_success.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 from nose.plugins.plugintest import PluginTester, remove_timings
 
 support = os.path.join(os.path.dirname(__file__), 'support')

diff --git a/functional_tests/test_suite.py b/functional_tests/test_suite.py
index a411469e32a042f3ba34c7530475997e107929ed..f52f9159a61615371d980b9b01560ff1387d66d1 100644 (file)
--- a/functional_tests/test_suite.py
+++ b/functional_tests/test_suite.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose import case
 from nose.suite import ContextSuiteFactory
 

diff --git a/functional_tests/test_xunit.py b/functional_tests/test_xunit.py
index 2e6129c08395d28ce19da3075388d1478d5cc4bf..c6987b2bf65cf05eaf37a579c2754956b7bd84bf 100644 (file)
--- a/functional_tests/test_xunit.py
+++ b/functional_tests/test_xunit.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 import os
-import unittest
+import unittest2 as unittest
 from nose.plugins.xunit import Xunit
 from nose.plugins.skip import Skip
 from nose.plugins import PluginTester

diff --git a/nose/case.py b/nose/case.py
index c8dc9794767ff3e2659a58dccf0bc9466eaa32f9..28ac68e62bcdd5ea8187ddb0271e9a581660194d 100644 (file)
--- a/nose/case.py
+++ b/nose/case.py
@@ -4,7 +4,7 @@ to create test cases from test functions and methods in test classes.
 """
 import logging
 import sys
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose.failure import Failure # for backwards compatibility
 from nose.util import resolve_name, test_address, try_run

diff --git a/nose/core.py b/nose/core.py
index 5e80debc05dc9732628b2638cf2b3955e6ee9088..00f289ed82043ce51f040f2a155eded9ec2109ee 100644 (file)
--- a/nose/core.py
+++ b/nose/core.py
@@ -6,7 +6,7 @@ import logging
 import os
 import sys
 import time
-import unittest
+import unittest2 as unittest
 
 from nose.config import Config, all_config_files
 from nose.loader import defaultTestLoader

diff --git a/nose/ext/dtcompat.py b/nose/ext/dtcompat.py
index 332cf08c1297683768f2bb5d7d2c1d303b047a77..5e2de564d105c529b98f0c950bcec85e7b7de270 100644 (file)
--- a/nose/ext/dtcompat.py
+++ b/nose/ext/dtcompat.py
@@ -102,7 +102,7 @@ __all__ = [
 import __future__
 
 import sys, traceback, inspect, linecache, os, re
-import unittest, difflib, pdb, tempfile
+import unittest2 as unittest, difflib, pdb, tempfile
 import warnings
 from StringIO import StringIO
 

diff --git a/nose/failure.py b/nose/failure.py
index 1dff970371b689e55f1f9f8df5aa32a680052521..8da0e7b4f3d77ceabe01b7e813ae52b11877b6be 100644 (file)
--- a/nose/failure.py
+++ b/nose/failure.py
@@ -1,5 +1,5 @@
 import logging
-import unittest
+import unittest2 as unittest
 from traceback import format_tb
 
 log = logging.getLogger(__name__)

diff --git a/nose/loader.py b/nose/loader.py
index a4b8633f13c654b444e16a75ab8359ad2c3a7487..f735bb115309a440f910feaab6af5fe5e8480d0a 100644 (file)
--- a/nose/loader.py
+++ b/nose/loader.py
@@ -11,7 +11,7 @@ from __future__ import generators
 import logging
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from inspect import isfunction, ismethod
 from nose.case import FunctionTestCase, MethodTestCase
 from nose.failure import Failure

diff --git a/nose/plugins/collect.py b/nose/plugins/collect.py
index 6f9f0faa779ed44e29c3573d91f3cee080380ec7..edd9a4cf11a2158a6611048b15fbe7791626c6d5 100644 (file)
--- a/nose/plugins/collect.py
+++ b/nose/plugins/collect.py
@@ -13,7 +13,7 @@ people watching your demo think all of your tests pass.
 from nose.plugins.base import Plugin
 from nose.case import Test
 import logging
-import unittest
+import unittest2 as unittest
 
 log = logging.getLogger(__name__)
 

diff --git a/nose/plugins/doctests.py b/nose/plugins/doctests.py
index b296b7d4585cecbe2a543727341fe4334b0927e4..734d590008c01af7e1657005210ac6372b4af6ea 100644 (file)
--- a/nose/plugins/doctests.py
+++ b/nose/plugins/doctests.py
@@ -52,7 +52,7 @@ from __future__ import generators
 import logging
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from inspect import getmodule
 from nose.plugins.base import Plugin
 from nose.suite import ContextList

diff --git a/nose/plugins/errorclass.py b/nose/plugins/errorclass.py
index d327194c78aad1d32070a217cdb1910a79c70d77..f34431920ceafa1a58d9aebeeb0de267bfec37a2 100644 (file)
--- a/nose/plugins/errorclass.py
+++ b/nose/plugins/errorclass.py
@@ -36,12 +36,12 @@ an ErrorClass plugin.
 Let's see the plugin in action. First some boilerplate.
 
     >>> import sys
-    >>> import unittest
+    >>> import unittest2 as unittest
     >>> try:
     ...     # 2.7+
     ...     from unittest.runner import _WritelnDecorator
     ... except ImportError:
-    ...     from unittest import _WritelnDecorator
+    ...     from unittest2 import _WritelnDecorator
     ...
     >>> buf = _WritelnDecorator(sys.stdout)
 

diff --git a/nose/plugins/multiprocess.py b/nose/plugins/multiprocess.py
index 5f1f3a712b06547309031758f8e59bf915b3b81e..6490a14938c93727ed3b7c4806820ef81b513a84 100644 (file)
--- a/nose/plugins/multiprocess.py
+++ b/nose/plugins/multiprocess.py
@@ -86,7 +86,7 @@ import os
 import sys
 import time
 import traceback
-import unittest
+import unittest2 as unittest
 import pickle
 import nose.case
 from nose.core import TextTestRunner
@@ -100,7 +100,7 @@ try:
     # 2.7+
     from unittest.runner import _WritelnDecorator
 except ImportError:
-    from unittest import _WritelnDecorator
+    from unittest2 import _WritelnDecorator
 from Queue import Empty
 from warnings import warn
 try:

diff --git a/nose/plugins/plugintest.py b/nose/plugins/plugintest.py
index 49f18841d9b90715818af61040b7c0f8dc3655fe..2b1f9f59eeb3d8bd1311ad77a2f12468646a5bea 100644 (file)
--- a/nose/plugins/plugintest.py
+++ b/nose/plugins/plugintest.py
@@ -9,7 +9,7 @@ test plugins in their native runtime environment.
 
 Here's a simple example with a do-nothing plugin and a composed suite.
 
-    >>> import unittest
+    >>> import unittest2 as unittest
     >>> from nose.plugins import Plugin, PluginTester
     >>> class FooPlugin(Plugin):
     ...     pass
@@ -44,7 +44,7 @@ Here's a simple example with a do-nothing plugin and a composed suite.
 And here is a more complex example of testing a plugin that has extra
 arguments and reads environment variables.
     
-    >>> import unittest, os
+    >>> import unittest2 as unittest, os
     >>> from nose.plugins import Plugin, PluginTester
     >>> class FancyOutputter(Plugin):
     ...     name = "fancy"
@@ -158,7 +158,7 @@ class PluginTester(object):
         
         Here is an example of a basic suite object you can return ::
         
-            >>> import unittest
+            >>> import unittest2 as unittest
             >>> class SomeTest(unittest.TestCase):
             ...     def runTest(self):
             ...         raise ValueError("Now do something, plugin!")

diff --git a/nose/result.py b/nose/result.py
index 0d070d3fb9c985c506bf9cb499be076b0ee1d88f..03e2d5098c55438460e960a99b6dc6bacc485f0d 100644 (file)
--- a/nose/result.py
+++ b/nose/result.py
@@ -13,7 +13,7 @@ try:
     # 2.7+
     from unittest.runner import _TextTestResult
 except ImportError:
-    from unittest import _TextTestResult
+    from unittest2 import _TextTestResult
 from nose.config import Config
 from nose.util import isclass, ln as _ln # backwards compat
 

diff --git a/nose/selector.py b/nose/selector.py
index c4a006a8d758fea00996eecaae01094a161be45d..999b43c905140cf451f4cfb4b1413b6bd8dabc22 100644 (file)
--- a/nose/selector.py
+++ b/nose/selector.py
@@ -8,7 +8,7 @@ thinks may be a test.
 """
 import logging
 import os
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose.util import split_test_name, src, getfilename, getpackage, ispackage
 

diff --git a/nose/suite.py b/nose/suite.py
index eb448818c989ba37d64b4cd567c341c7e815048b..92696ee3422f80b922167a0a7a01826b8f285ab1 100644 (file)
--- a/nose/suite.py
+++ b/nose/suite.py
@@ -11,7 +11,7 @@ from __future__ import generators
 
 import logging
 import sys
-import unittest
+import unittest2 as unittest
 from nose.case import Test
 from nose.config import Config
 from nose.proxy import ResultProxyFactory

diff --git a/nose/tools.py b/nose/tools.py
index 2fb3e7520a92253be9c10530081b2b8e03bc5e4a..5f739d2a4b91304fd92535f47b2a4d3a804ccf12 100644 (file)
--- a/nose/tools.py
+++ b/nose/tools.py
@@ -8,7 +8,7 @@ on any of these methods.
 """
 import re
 import time
-import unittest
+import unittest2 as unittest
 
 
 __all__ = ['ok_', 'eq_', 'make_decorator', 'raises', 'set_trace', 'timed',

diff --git a/nose/util.py b/nose/util.py
index 7b9c233185e4531552b0449b28acbb6e6e7a8653..85de3b4321c5b4f6f8caf7959a1672075a6e12fd 100644 (file)
--- a/nose/util.py
+++ b/nose/util.py
@@ -7,7 +7,7 @@ import os
 import re
 import sys
 import types
-import unittest
+import unittest2 as unittest
 from types import ClassType, TypeType
 
 try:

diff --git a/packaging/python-nose.spec b/packaging/python-nose.spec
index 63a1de126c9389b0fbcc0eddd41a27aa3e85abe2..5b75d8f4323379681be72bd9022981f9276d986a 100644 (file)
--- a/packaging/python-nose.spec
+++ b/packaging/python-nose.spec
@@ -29,6 +29,7 @@ BuildRequires: python-setuptools
 BuildRequires: dos2unix
 BuildRequires:  python-coverage
 Requires:       python-setuptools
+Requires:       python-unittest2
 
 %description
 nose extends the test loading and running features of unittest, making

diff --git a/unit_tests/support/test.py b/unit_tests/support/test.py
index 9ad04e092f16a9be509acad1ff0ea54d02e6a79f..ac0bd0ed24fb5bc5cbf6e26917f1509b3ff94bda 100644 (file)
--- a/unit_tests/support/test.py
+++ b/unit_tests/support/test.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 
 class Something(unittest.TestCase):
     def test_something(self):

diff --git a/unit_tests/test_bug105.py b/unit_tests/test_bug105.py
index e0362a81beaf645e445191a34c5edb9aeb063c03..576445425439db637f47230c7f14fc501044295e 100644 (file)
--- a/unit_tests/test_bug105.py
+++ b/unit_tests/test_bug105.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 
 class TestBug105(unittest.TestCase):
 

diff --git a/unit_tests/test_capture_plugin.py b/unit_tests/test_capture_plugin.py
index 8988665e0da2fe7cfcf869f9a79648dc9263a330..eb915a7744041d773c11fa2c81eb5bd41c1a8459 100644 (file)
--- a/unit_tests/test_capture_plugin.py
+++ b/unit_tests/test_capture_plugin.py
@@ -1,5 +1,5 @@
 import sys
-import unittest
+import unittest2 as unittest
 from optparse import OptionParser
 from nose.config import Config
 from nose.plugins.capture import Capture

diff --git a/unit_tests/test_cases.py b/unit_tests/test_cases.py
index 2e1ca2a15d34a635a50d4751d7701e51e14d438f..54041e13ebd08b993e0b07f8c6ca0d7d718e1ab3 100644 (file)
--- a/unit_tests/test_cases.py
+++ b/unit_tests/test_cases.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 import pdb
 import sys
 import nose.case

diff --git a/unit_tests/test_config.py b/unit_tests/test_config.py
index 8887dddbf4e98767ae499fc7be5852b3419534d3..f43aee70b9237dec1f2f1f7ed991cb9e33ee86ba 100644 (file)
--- a/unit_tests/test_config.py
+++ b/unit_tests/test_config.py
@@ -1,7 +1,7 @@
 import re
 import os
 import tempfile
-import unittest
+import unittest2 as unittest
 import warnings
 import pickle
 import sys

diff --git a/unit_tests/test_core.py b/unit_tests/test_core.py
index 6fb6cefcea835373dba150fcc9a6a22d0dd4f45a..d8dc61df686ba68f9b8a55514c8c01fbe0db1935 100644 (file)
--- a/unit_tests/test_core.py
+++ b/unit_tests/test_core.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from cStringIO import StringIO
 from optparse import OptionParser
 import nose.core

diff --git a/unit_tests/test_deprecated_plugin.py b/unit_tests/test_deprecated_plugin.py
index 6c6248114072203ef34e096166f23f350ed94698..8b8b0a96e2bf2ca013d7fd0b259c3622dc14e05c 100644 (file)
--- a/unit_tests/test_deprecated_plugin.py
+++ b/unit_tests/test_deprecated_plugin.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose.plugins.deprecated import Deprecated, DeprecatedTest
 from nose.result import TextTestResult, _TextTestResult
@@ -8,7 +8,7 @@ try:
     # 2.7+
     from unittest.runner import _WritelnDecorator
 except ImportError:
-    from unittest import _WritelnDecorator
+    from unittest2 import _WritelnDecorator
 
 
 class TestDeprecatedPlugin(unittest.TestCase):

diff --git a/unit_tests/test_doctest_error_handling.py b/unit_tests/test_doctest_error_handling.py
index fcdf388c781c1e58f1ef72ce24c791cb951c1450..37ab87a78fd8e30ad541ef2ea636f9962e75804d 100644 (file)
--- a/unit_tests/test_doctest_error_handling.py
+++ b/unit_tests/test_doctest_error_handling.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose.plugins import doctests
 from mock import Bucket

diff --git a/unit_tests/test_id_plugin.py b/unit_tests/test_id_plugin.py
index d70fc07e31298e3d70f8671ccb37e56dbd35072c..8ac38c71a93cc94bdf39d9e5327651e11e3c3acc 100644 (file)
--- a/unit_tests/test_id_plugin.py
+++ b/unit_tests/test_id_plugin.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose.plugins.builtin import TestId
 import mock

diff --git a/unit_tests/test_importer.py b/unit_tests/test_importer.py
index 91de8a93ab6111f179f549a6fa39357a2c8aa94d..75ec38b09ccf826665cd590ef8d1250510f6164f 100644 (file)
--- a/unit_tests/test_importer.py
+++ b/unit_tests/test_importer.py
@@ -1,6 +1,6 @@
 import os
 import sys
-import unittest
+import unittest2 as unittest
 import nose.config
 import nose.importer
 

diff --git a/unit_tests/test_inspector.py b/unit_tests/test_inspector.py
index be1801444c9c0b1fce8209f60e34f5fcbbc454d5..0e48dffa20810153d0f3693466ad6237acb777e0 100644 (file)
--- a/unit_tests/test_inspector.py
+++ b/unit_tests/test_inspector.py
@@ -3,7 +3,7 @@ import sys
 import textwrap
 import tokenize
 import traceback
-import unittest
+import unittest2 as unittest
 
 try:
     from cStringIO import StringIO

diff --git a/unit_tests/test_issue_006.py b/unit_tests/test_issue_006.py
index d04c174d9c8a526afe8671863525272cdae9e0c0..110b8dc9702a1a3c2b308bd554a0e53b2c2c67a1 100644 (file)
--- a/unit_tests/test_issue_006.py
+++ b/unit_tests/test_issue_006.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 
 class TestIssue006(unittest.TestCase):
     def test_load_nested_generator(self):

diff --git a/unit_tests/test_issue_065.py b/unit_tests/test_issue_065.py
index 425f19793a4584eed8fbcdb8b0388f874094e811..44e40cc39b6dd7477e0f359735ae7e6080f477fc 100644 (file)
--- a/unit_tests/test_issue_065.py
+++ b/unit_tests/test_issue_065.py
@@ -1,6 +1,6 @@
 import os
 from nose import loader
-import unittest
+import unittest2 as unittest
 
 support = os.path.join(os.path.dirname(__file__), 'support')
 

diff --git a/unit_tests/test_issue_101.py b/unit_tests/test_issue_101.py
index cccfc42027bcd9799b906af02d8e06129c98bb00..b9f17f034a456f96f0b2cb393e6f6dddb1b65f67 100644 (file)
--- a/unit_tests/test_issue_101.py
+++ b/unit_tests/test_issue_101.py
@@ -1,5 +1,5 @@
 import sys
-import unittest
+import unittest2 as unittest
 import warnings
 from nose.plugins.errorclass import ErrorClass, ErrorClassPlugin
 

diff --git a/unit_tests/test_issue_230.py b/unit_tests/test_issue_230.py
index 41a717b243674391ebfd16a4870a6d306fb2b618..51747b206db6eee8ed96f1cecb6d2bc412087bfa 100644 (file)
--- a/unit_tests/test_issue_230.py
+++ b/unit_tests/test_issue_230.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 
 class TestIssue230(unittest.TestCase):
 

diff --git a/unit_tests/test_lazy_suite.py b/unit_tests/test_lazy_suite.py
index 79cdcf0a01dcbbbafb97b9194d16fa268a920058..7eeb8947c3a2dc7d72f038bc36f8a983edad291a 100644 (file)
--- a/unit_tests/test_lazy_suite.py
+++ b/unit_tests/test_lazy_suite.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 from nose.suite import LazySuite
 from helpers import iter_compat
 

diff --git a/unit_tests/test_loader.py b/unit_tests/test_loader.py
index 08f0686f0d0fc85a084c4f68f1f408433e5990cb..ce2e64741da49421cb4618b12d6b2b2032cd663b 100644 (file)
--- a/unit_tests/test_loader.py
+++ b/unit_tests/test_loader.py
@@ -1,7 +1,7 @@
 import imp
 import os
 import sys
-import unittest
+import unittest2 as unittest
 from nose.loader import TestLoader as Loader
 
 from nose import util, loader, selector # so we can set mocks

diff --git a/unit_tests/test_logcapture_plugin.py b/unit_tests/test_logcapture_plugin.py
index 19363c8f106591763da9d29c59d71f9f431d3a50..1efed0f69c23eb7498578b4cff9b9958d1601778 100644 (file)
--- a/unit_tests/test_logcapture_plugin.py
+++ b/unit_tests/test_logcapture_plugin.py
@@ -5,7 +5,7 @@ from nose.plugins.logcapture import LogCapture
 from nose.tools import eq_
 import logging
 from logging import StreamHandler
-import unittest
+import unittest2 as unittest
 
 if sys.version_info >= (2, 7):
     py27 = True

diff --git a/unit_tests/test_logging.py b/unit_tests/test_logging.py
index 82386bf73f013eeab653c366d5184cb33a6efc61..dbe6371c87cfc95e64311ffe3b6f18db9453a588 100644 (file)
--- a/unit_tests/test_logging.py
+++ b/unit_tests/test_logging.py
@@ -1,5 +1,5 @@
 import logging
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 #from nose.core import configure_logging
 from mock import *

diff --git a/unit_tests/test_multiprocess.py b/unit_tests/test_multiprocess.py
index ec06ec9098b5f7b42e7f755ae9a5dd6cfe0e3e81..164d4420fa09436ee2923d581123f266baa7b02e 100644 (file)
--- a/unit_tests/test_multiprocess.py
+++ b/unit_tests/test_multiprocess.py
@@ -1,6 +1,6 @@
 import pickle
 import sys
-import unittest
+import unittest2 as unittest
 
 from nose import case
 from nose.plugins import multiprocess
@@ -11,7 +11,7 @@ try:
     # 2.7+
     from unittest.runner import _WritelnDecorator
 except ImportError:
-    from unittest import _WritelnDecorator
+    from unittest2 import _WritelnDecorator
 
 
 class ArgChecker:

diff --git a/unit_tests/test_multiprocess_runner.py b/unit_tests/test_multiprocess_runner.py
index 71ee398acf4929bc9ff9aedceaf52f0d44c4a007..1140e1b5fb97f84672ae163eb27d4908392659b4 100644 (file)
--- a/unit_tests/test_multiprocess_runner.py
+++ b/unit_tests/test_multiprocess_runner.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 import imp
 import sys
 from nose.loader import TestLoader

diff --git a/unit_tests/test_pdb_plugin.py b/unit_tests/test_pdb_plugin.py
index cdd43f23c4a6ef6c895a40120d5e477218ef7ac4..6dc75de355d82a1d2bb0bb4789af48a080e09e16 100644 (file)
--- a/unit_tests/test_pdb_plugin.py
+++ b/unit_tests/test_pdb_plugin.py
@@ -1,5 +1,5 @@
 import sys
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose.plugins import debug
 from optparse import OptionParser

diff --git a/unit_tests/test_plugin.py b/unit_tests/test_plugin.py
index aa2d9ccb81317910fad319f97aa8b2ae70a7199c..e3663949d5e6624b50d757632f8281ec34428b85 100644 (file)
--- a/unit_tests/test_plugin.py
+++ b/unit_tests/test_plugin.py
@@ -1,5 +1,5 @@
 import optparse
-import unittest
+import unittest2 as unittest
 
 import nose.plugins
 

diff --git a/unit_tests/test_plugin_interfaces.py b/unit_tests/test_plugin_interfaces.py
index 499af6bb0ec91c2261284c38b35ca7347902a480..08c0f60a6432756b6e5cfea576b9acf3de45eacf 100644 (file)
--- a/unit_tests/test_plugin_interfaces.py
+++ b/unit_tests/test_plugin_interfaces.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 from nose.plugins.base import IPluginInterface
 
 class TestPluginInterfaces(unittest.TestCase):

diff --git a/unit_tests/test_plugin_manager.py b/unit_tests/test_plugin_manager.py
index 578ce039e43ee6a69450b29711c5cb599b3988de..b99dbea4d7b1dd5d10c3103ce1b36bc7bba49d4b 100644 (file)
--- a/unit_tests/test_plugin_manager.py
+++ b/unit_tests/test_plugin_manager.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 from nose import case
 from nose.plugins import Plugin, PluginManager
 

diff --git a/unit_tests/test_plugins.py b/unit_tests/test_plugins.py
index 05a58389b473143ff6d6dcc622ed37a7023ec8fe..6fdbf1903d4a767580a1380db59d564680f8a8b6 100644 (file)
--- a/unit_tests/test_plugins.py
+++ b/unit_tests/test_plugins.py
@@ -1,7 +1,7 @@
 import logging
 import os
 import sys
-import unittest
+import unittest2 as unittest
 import nose.plugins
 from optparse import OptionParser
 import tempfile

diff --git a/unit_tests/test_result_proxy.py b/unit_tests/test_result_proxy.py
index 9ed1e112c1e56745f539206100a4d83b135c8fce..4c55916be6f4bbed2484d197cdd0baabd791ca90 100644 (file)
--- a/unit_tests/test_result_proxy.py
+++ b/unit_tests/test_result_proxy.py
@@ -1,5 +1,5 @@
 import sys
-import unittest
+import unittest2 as unittest
 from inspect import ismethod
 from nose.config import Config
 from nose.proxy import ResultProxyFactory, ResultProxy

diff --git a/unit_tests/test_selector.py b/unit_tests/test_selector.py
index f09f7290471caddeb2c9beb06b0006ba44119cd1..4c2d028d1ce5f769f8a8a5e6fc71aa8ccff39a5a 100644 (file)
--- a/unit_tests/test_selector.py
+++ b/unit_tests/test_selector.py
@@ -1,7 +1,7 @@
 import logging
 import os
 import re
-import unittest
+import unittest2 as unittest
 import nose.selector
 from nose.config import Config
 from nose.selector import log, Selector

diff --git a/unit_tests/test_selector_plugins.py b/unit_tests/test_selector_plugins.py
index 7682d79a6b4251b2db8ad0734180edb7955b7bac..55e0f7acd88e61bc4ad774bc11155bcdb31cd645 100644 (file)
--- a/unit_tests/test_selector_plugins.py
+++ b/unit_tests/test_selector_plugins.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 import nose.selector
 from nose.config import Config
 from nose.plugins.base import Plugin

diff --git a/unit_tests/test_skip_plugin.py b/unit_tests/test_skip_plugin.py
index c1dcceea73883e226e8ade5397a206049895b420..423e8cd8950c0c5a3300008b562d4c849637ecee 100644 (file)
--- a/unit_tests/test_skip_plugin.py
+++ b/unit_tests/test_skip_plugin.py
@@ -1,4 +1,4 @@
-import unittest
+import unittest2 as unittest
 from nose.config import Config
 from nose.plugins.skip import Skip, SkipTest
 from nose.result import TextTestResult
@@ -9,7 +9,7 @@ try:
     # 2.7+
     from unittest.runner import _WritelnDecorator
 except ImportError:
-    from unittest import _WritelnDecorator
+    from unittest2 import _WritelnDecorator
 
 
 class TestSkipPlugin(unittest.TestCase):

diff --git a/unit_tests/test_suite.py b/unit_tests/test_suite.py
index b6eae20ffa8e468ca70e29817d4e6ee700dd141c..f3bec844e98dc9b6fa3421a7d95c665ef6c6a62b 100644 (file)
--- a/unit_tests/test_suite.py
+++ b/unit_tests/test_suite.py
@@ -4,7 +4,7 @@ from nose.suite import LazySuite, ContextSuite, ContextSuiteFactory, \
      ContextList
 import imp
 import sys
-import unittest
+import unittest2 as unittest
 from mock import ResultProxyFactory, ResultProxy
 
 

diff --git a/unit_tests/test_tools.py b/unit_tests/test_tools.py
index 839d12b69362b7b7b0751a5448c8ad034cc42c88..b57a23a20b9d13bc442939016d5044cb690592b6 100644 (file)
--- a/unit_tests/test_tools.py
+++ b/unit_tests/test_tools.py
@@ -1,6 +1,6 @@
 import sys
 import time
-import unittest
+import unittest2 as unittest
 from nose.tools import *
 
 compat_24 =  sys.version_info >= (2, 4)
@@ -152,7 +152,7 @@ class TestTools(unittest.TestCase):
     def test_multiple_with_setup(self):
         from nose.tools import with_setup
         from nose.case import FunctionTestCase
-        from unittest import TestResult
+        from unittest2 import TestResult
         
         called = []
         def test():

diff --git a/unit_tests/test_twisted_testcase.py b/unit_tests/test_twisted_testcase.py
index 850d6e799d3246c6bd93fddf77ac468c096d31be..c8c342a10cef2f24a957dd3d4c45416aae6a0741 100644 (file)
--- a/unit_tests/test_twisted_testcase.py
+++ b/unit_tests/test_twisted_testcase.py
@@ -1,5 +1,5 @@
 try:
-    from twisted.trial import unittest
+    from twisted.trial import unittest2 as unittest
 except ImportError:
     from nose import SkipTest
     raise SkipTest('twisted not available; skipping')

diff --git a/unit_tests/test_utils.py b/unit_tests/test_utils.py
index 4a26ec71b6bfd6d64928b3385ee1b81567db6548..ae042b21a22f1e4b6f53df8087072af6ac30ac86 100644 (file)
--- a/unit_tests/test_utils.py
+++ b/unit_tests/test_utils.py
@@ -1,5 +1,5 @@
 import os
-import unittest
+import unittest2 as unittest
 import nose
 from nose import case
 # don't import * -- some util functions look testlike

diff --git a/unit_tests/test_xunit.py b/unit_tests/test_xunit.py
index 0e876960c5ed8c1c9abb65ef84ac9d0e324ccbc1..5881ffed3039ec82d805465d4da9eca9f10930a6 100644 (file)
--- a/unit_tests/test_xunit.py
+++ b/unit_tests/test_xunit.py
@@ -2,7 +2,7 @@
 import sys
 import os
 import optparse
-import unittest
+import unittest2 as unittest
 from xml.sax import saxutils
 
 from nose.tools import eq_