Skip to content

Commit

Permalink
-
Browse files Browse the repository at this point in the history
  • Loading branch information
cool-RR committed Jun 10, 2015
1 parent 56e5ba3 commit 4b4ec23
Show file tree
Hide file tree
Showing 15 changed files with 31 additions and 31 deletions.
2 changes: 1 addition & 1 deletion source_py2/python_toolbox/cute_testing.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import nose
import sys

from python_toolbox.third_party import unittest2
from python_toolbox.third_party import python_toolbox.third_party.unittest2

from python_toolbox import cute_inspect
from python_toolbox import context_management
Expand Down
20 changes: 10 additions & 10 deletions source_py2/python_toolbox/third_party/unittest2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
framework in Python 2.7 and beyond. It is tested to run on Python 2.4 - 2.7.
To use unittest2 instead of unittest simply replace ``import unittest`` with
``import unittest2``.
``import python_toolbox.third_party.unittest2``.
Copyright (c) 1999-2003 Steve Purcell
Expand Down Expand Up @@ -37,22 +37,22 @@
__all__.extend(['getTestCaseNames', 'makeSuite', 'findTestCases'])


from unittest2.collector import collector
from unittest2.result import TestResult
from unittest2.case import (
from python_toolbox.third_party.unittest2.collector import collector
from python_toolbox.third_party.unittest2.result import TestResult
from python_toolbox.third_party.unittest2.case import (
TestCase, FunctionTestCase, SkipTest, skip, skipIf,
skipUnless, expectedFailure
)
from unittest2.suite import BaseTestSuite, TestSuite
from unittest2.loader import (
from python_toolbox.third_party.unittest2.suite import BaseTestSuite, TestSuite
from python_toolbox.third_party.unittest2.loader import (
TestLoader, defaultTestLoader, makeSuite, getTestCaseNames,
findTestCases
)
from unittest2.main import TestProgram, main
from unittest2.runner import TextTestRunner, TextTestResult
from python_toolbox.third_party.unittest2.main import TestProgram, main
from python_toolbox.third_party.unittest2.runner import TextTestRunner, TextTestResult

try:
from unittest2.signals import (
from python_toolbox.third_party.unittest2.signals import (
installHandler, registerResult, removeResult, removeHandler
)
except ImportError:
Expand Down Expand Up @@ -80,7 +80,7 @@ def load_tests(loader, tests, pattern):
# All our tests are in test/ - the test objects found in unittest2 itself
# are base classes not intended to be executed. This load_tests intercepts
# discovery to prevent that.
import unittest2.test
import python_toolbox.third_party.unittest2.test
result = loader.suiteClass()
for path in unittest2.test.__path__:
result.addTests(loader.discover(path, pattern=pattern))
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@

__unittest = True

from unittest2.main import main, TestProgram
from python_toolbox.third_party.unittest2.main import main, TestProgram
def main_():
main(module=None)

Expand Down
6 changes: 3 additions & 3 deletions source_py2/python_toolbox/third_party/unittest2/case.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
import six
from six.moves import range

from unittest2 import result
from unittest2.util import (
from python_toolbox.third_party.unittest2 import result
from python_toolbox.third_party.unittest2.util import (
safe_repr, safe_str, strclass,
unorderable_list_difference, _common_shorten_repr
)

from unittest2.compatibility import (
from python_toolbox.third_party.unittest2.compatibility import (
wraps, with_context, catch_warnings, raise_from
)

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import os
import sys
from unittest2.loader import defaultTestLoader
from python_toolbox.third_party.unittest2.loader import defaultTestLoader

def collector():
# import __main__ triggers code re-execution
Expand Down
6 changes: 3 additions & 3 deletions source_py2/python_toolbox/third_party/unittest2/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@

from fnmatch import fnmatch

from unittest2 import case, suite, util
from unittest2.compatibility import raise_from
from python_toolbox.third_party.unittest2 import case, suite, util
from python_toolbox.third_party.unittest2.compatibility import raise_from

try:
from os.path import relpath
except ImportError:
from unittest2.compatibility import relpath
from python_toolbox.third_party.unittest2.compatibility import relpath

__unittest = True

Expand Down
4 changes: 2 additions & 2 deletions source_py2/python_toolbox/third_party/unittest2/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@

import six

from unittest2 import loader, runner
from python_toolbox.third_party.unittest2 import loader, runner
try:
from unittest2.signals import installHandler
from python_toolbox.third_party.unittest2.signals import installHandler
except ImportError:
installHandler = None

Expand Down
4 changes: 2 additions & 2 deletions source_py2/python_toolbox/third_party/unittest2/result.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@
from six.moves import StringIO
import traceback2 as traceback

from unittest2 import util
from unittest2.compatibility import wraps
from python_toolbox.third_party.unittest2 import util
from python_toolbox.third_party.unittest2.compatibility import wraps

__unittest = True

Expand Down
4 changes: 2 additions & 2 deletions source_py2/python_toolbox/third_party/unittest2/runner.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@

from six import u

from unittest2 import result
from python_toolbox.third_party.unittest2 import result

try:
from unittest2.signals import registerResult
from python_toolbox.third_party.unittest2.signals import registerResult
except ImportError:
def registerResult(_):
pass
Expand Down
2 changes: 1 addition & 1 deletion source_py2/python_toolbox/third_party/unittest2/signals.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import signal
import weakref

from unittest2.compatibility import wraps
from python_toolbox.third_party.unittest2.compatibility import wraps

__unittest = True

Expand Down
2 changes: 1 addition & 1 deletion source_py2/python_toolbox/third_party/unittest2/suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import six

from unittest2 import case, util
from python_toolbox.third_party.unittest2 import case, util

__unittest = True

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import sys

import nose
from python_toolbox.third_party import unittest2
from python_toolbox.third_party import python_toolbox.third_party.unittest2

import python_toolbox
from python_toolbox.context_management import (ContextManager,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import abc
import collections
import decimal as decimal_module
from python_toolbox.third_party import unittest2
from python_toolbox.third_party import python_toolbox.third_party.unittest2
import copy

import nose
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
import weakref

import nose
from python_toolbox.third_party import unittest2
from python_toolbox.third_party import python_toolbox.third_party.unittest2
from python_toolbox import sys_tools
from python_toolbox import gc_tools

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from python_toolbox.third_party import unittest2
from python_toolbox.third_party import python_toolbox.third_party.unittest2

__test__ = False

Expand Down

0 comments on commit 4b4ec23

Please sign in to comment.