From bd05600fe9ab6273d2bd7f44483d28b065bcf07c Mon Sep 17 00:00:00 2001 From: Markus Lehtonen Date: Tue, 5 Mar 2013 16:54:27 +0200 Subject: [PATCH] Use unittest2 module instead of unittest Required by CentOS. Signed-off-by: Markus Lehtonen --- functional_tests/doc_tests/test_issue119/test_zeronine.py | 2 +- .../doc_tests/test_issue145/support/package1/test_module.py | 2 +- .../doc_tests/test_selector_plugin/support/tests/testlib.py | 2 +- functional_tests/support/att/test_attr.py | 2 +- functional_tests/support/idp/tests.py | 2 +- functional_tests/support/ltftc/tests.py | 2 +- .../support/package1/tests/test_example_function.py | 2 +- functional_tests/support/twist/test_twisted.py | 2 +- functional_tests/support/xunit/test_xunit_as_suite.py | 2 +- functional_tests/test_attribute_plugin.py | 2 +- functional_tests/test_buggy_generators.py | 2 +- functional_tests/test_cases.py | 2 +- functional_tests/test_collector.py | 2 +- functional_tests/test_commands.py | 2 +- functional_tests/test_config_files.py | 2 +- functional_tests/test_doctest_plugin.py | 2 +- functional_tests/test_failuredetail_plugin.py | 2 +- functional_tests/test_id_plugin.py | 2 +- functional_tests/test_importer.py | 2 +- functional_tests/test_isolate_plugin.py | 2 +- functional_tests/test_issue_072.py | 2 +- functional_tests/test_issue_082.py | 2 +- functional_tests/test_load_tests_from_test_case.py | 2 +- functional_tests/test_loader.py | 4 ++-- functional_tests/test_namespace_pkg.py | 2 +- functional_tests/test_plugin_api.py | 2 +- functional_tests/test_plugins.py | 2 +- functional_tests/test_plugintest.py | 2 +- functional_tests/test_program.py | 2 +- functional_tests/test_result.py | 2 +- functional_tests/test_selector.py | 2 +- functional_tests/test_skip_pdb_interaction.py | 2 +- functional_tests/test_success.py | 2 +- functional_tests/test_suite.py | 2 +- functional_tests/test_xunit.py | 2 +- nose/case.py | 2 +- nose/core.py | 2 +- nose/ext/dtcompat.py | 2 +- nose/failure.py | 2 +- nose/loader.py | 2 +- nose/plugins/collect.py | 2 +- nose/plugins/doctests.py | 2 +- nose/plugins/errorclass.py | 4 ++-- nose/plugins/multiprocess.py | 4 ++-- nose/plugins/plugintest.py | 6 +++--- nose/result.py | 2 +- nose/selector.py | 2 +- nose/suite.py | 2 +- nose/tools.py | 2 +- nose/util.py | 2 +- packaging/python-nose.spec | 1 + unit_tests/support/test.py | 2 +- unit_tests/test_bug105.py | 2 +- unit_tests/test_capture_plugin.py | 2 +- unit_tests/test_cases.py | 2 +- unit_tests/test_config.py | 2 +- unit_tests/test_core.py | 2 +- unit_tests/test_deprecated_plugin.py | 4 ++-- unit_tests/test_doctest_error_handling.py | 2 +- unit_tests/test_id_plugin.py | 2 +- unit_tests/test_importer.py | 2 +- unit_tests/test_inspector.py | 2 +- unit_tests/test_issue_006.py | 2 +- unit_tests/test_issue_065.py | 2 +- unit_tests/test_issue_101.py | 2 +- unit_tests/test_issue_230.py | 2 +- unit_tests/test_lazy_suite.py | 2 +- unit_tests/test_loader.py | 2 +- unit_tests/test_logcapture_plugin.py | 2 +- unit_tests/test_logging.py | 2 +- unit_tests/test_multiprocess.py | 4 ++-- unit_tests/test_multiprocess_runner.py | 2 +- unit_tests/test_pdb_plugin.py | 2 +- unit_tests/test_plugin.py | 2 +- unit_tests/test_plugin_interfaces.py | 2 +- unit_tests/test_plugin_manager.py | 2 +- unit_tests/test_plugins.py | 2 +- unit_tests/test_result_proxy.py | 2 +- unit_tests/test_selector.py | 2 +- unit_tests/test_selector_plugins.py | 2 +- unit_tests/test_skip_plugin.py | 4 ++-- unit_tests/test_suite.py | 2 +- unit_tests/test_tools.py | 4 ++-- unit_tests/test_twisted_testcase.py | 2 +- unit_tests/test_utils.py | 2 +- unit_tests/test_xunit.py | 2 +- 86 files changed, 95 insertions(+), 94 deletions(-) diff --git a/functional_tests/doc_tests/test_issue119/test_zeronine.py b/functional_tests/doc_tests/test_issue119/test_zeronine.py index 6a4f450..fa76c03 100644 --- 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 0c5ac78..adbab34 100644 --- 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 92c4f96..32b2bd9 100644 --- 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 20e1e49..3e4fea2 100644 --- 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 fc58278..977f3d7 100644 --- 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 02208a1..79b8d88 100644 --- 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 d74f2a5..2ace73c 100644 --- 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 d6c57c2..ecf51dc 100644 --- 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 ec256b5..0551e12 100644 --- 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 f62594e..a06e44d 100644 --- 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 9e6e168..9b12cca 100644 --- 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 99b9071..d8d1386 100644 --- 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 c3b9dca..9feccf9 100644 --- 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 682af04..92e0e9a 100644 --- 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 5f18f3a..ef5473c 100644 --- 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 c91ecc5..e0d67c6 100644 --- 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 284cf49..627ae07 100644 --- 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 cc8a308..5ea7525 100644 --- 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 c24fdcf..8b7367b 100644 --- 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 087dcaa..bc19701 100644 --- 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 3848f6f..b1c4993 100644 --- 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 06fa019..529efbf 100644 --- 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 42f8563..a4cf504 100644 --- 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 6f73559..96a105e 100644 --- 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 2db051e..ffeef6f 100644 --- 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 c508ded..5caf3a1 100644 --- 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 eff6c7a..bdd04d1 100644 --- 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 7d1a65b..b0bfba4 100644 --- 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 bb63818..f1985a6 100644 --- 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 7206020..00aba5f 100644 --- 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 6282ac4..ad00897 100644 --- 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 20c5f78..be2b27b 100644 --- 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 760a7d1..4f70eee 100644 --- 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 a411469..f52f915 100644 --- 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 2e6129c..c6987b2 100644 --- 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 c8dc979..28ac68e 100644 --- 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 5e80deb..00f289e 100644 --- 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 332cf08..5e2de56 100644 --- 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 1dff970..8da0e7b 100644 --- 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 a4b8633..f735bb1 100644 --- 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 6f9f0fa..edd9a4c 100644 --- 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 b296b7d..734d590 100644 --- 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 d327194..f344319 100644 --- 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 5f1f3a7..6490a14 100644 --- 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 49f1884..2b1f9f5 100644 --- 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 0d070d3..03e2d50 100644 --- 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 c4a006a..999b43c 100644 --- 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 eb44881..92696ee 100644 --- 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 2fb3e75..5f739d2 100644 --- 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 7b9c233..85de3b4 100644 --- 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 63a1de1..5b75d8f 100644 --- 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 9ad04e0..ac0bd0e 100644 --- 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 e0362a8..5764454 100644 --- 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 8988665..eb915a7 100644 --- 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 2e1ca2a..54041e1 100644 --- 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 8887ddd..f43aee7 100644 --- 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 6fb6cef..d8dc61d 100644 --- 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 6c62481..8b8b0a9 100644 --- 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 fcdf388..37ab87a 100644 --- 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 d70fc07..8ac38c7 100644 --- 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 91de8a9..75ec38b 100644 --- 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 be18014..0e48dff 100644 --- 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 d04c174..110b8dc 100644 --- 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 425f197..44e40cc 100644 --- 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 cccfc42..b9f17f0 100644 --- 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 41a717b..51747b2 100644 --- 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 79cdcf0..7eeb894 100644 --- 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 08f0686..ce2e647 100644 --- 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 19363c8..1efed0f 100644 --- 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 82386bf..dbe6371 100644 --- 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 ec06ec9..164d442 100644 --- 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 71ee398..1140e1b 100644 --- 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 cdd43f2..6dc75de 100644 --- 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 aa2d9cc..e366394 100644 --- 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 499af6b..08c0f60 100644 --- 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 578ce03..b99dbea 100644 --- 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 05a5838..6fdbf19 100644 --- 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 9ed1e11..4c55916 100644 --- 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 f09f729..4c2d028 100644 --- 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 7682d79..55e0f7a 100644 --- 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 c1dccee..423e8cd 100644 --- 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 b6eae20..f3bec84 100644 --- 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 839d12b..b57a23a 100644 --- 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 850d6e7..c8c342a 100644 --- 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 4a26ec7..ae042b2 100644 --- 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 0e87696..5881ffe 100644 --- 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_ -- 2.34.1