Clean up unittest imports

sebastinas · sebastinas · commit dbd8066697d4 · 2015-05-17T13:38:21.000+02:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/autocomplete.py b/bpython/autocomplete.py
@@ -488,7 +488,7 @@ def matches(self, cursor_offset, line, **kwargs):
                 self._orig_start = None
                 return None
             except IndexError:
-                # for https://github.com/bpython/bpython/issues/483
+                # for #483
                 self._orig_start = None
                 return None
 
diff --git a/bpython/test/test_config.py b/bpython/test/test_config.py
@@ -2,11 +2,7 @@
 import tempfile
 import textwrap
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
+from bpython.test import unittest
 from bpython import config
 
 TEST_THEME_PATH = os.path.join(os.path.dirname(__file__), "test.theme")
diff --git a/bpython/test/test_crashers.py b/bpython/test/test_crashers.py
@@ -6,10 +6,7 @@
 import termios
 import textwrap
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+from bpython.test import unittest
 
 try:
     from twisted.internet import reactor
diff --git a/bpython/test/test_curtsies_coderunner.py b/bpython/test/test_curtsies_coderunner.py
@@ -1,12 +1,6 @@
 import sys
 
-from bpython.test import mock
-
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
+from bpython.test import mock, unittest
 from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
 
 
diff --git a/bpython/test/test_curtsies_parser.py b/bpython/test/test_curtsies_parser.py
@@ -1,10 +1,6 @@
 from __future__ import unicode_literals
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
+from bpython.test import unittest
 from bpython.curtsiesfrontend import parse
 from curtsies.fmtfuncs import yellow, cyan, green, bold
 
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -9,11 +9,6 @@
 from contextlib import contextmanager
 from six.moves import StringIO
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 from bpython.curtsiesfrontend import repl as curtsiesrepl
 from bpython.curtsiesfrontend import interpreter
 from bpython.curtsiesfrontend import events as bpythonevents
@@ -22,7 +17,7 @@
 from bpython import args
 from bpython._py3compat import py3
 from bpython.test import (FixLanguageTestCase as TestCase, MagicIterMock, mock,
-                          builtin_target)
+                          builtin_target, unittest)
 
 
 def setup_config(conf):
diff --git a/bpython/test/test_filewatch.py b/bpython/test/test_filewatch.py
@@ -1,18 +1,13 @@
 import os
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 try:
     import watchdog
     from bpython.curtsiesfrontend.filewatch import ModuleChangedEventHandler
     has_watchdog = True
 except ImportError:
     has_watchdog = False
 
-from bpython.test import mock
+from bpython.test import mock, unittest
 
 @unittest.skipUnless(has_watchdog, "watchdog required")
 class TestModuleChangeEventHandler(unittest.TestCase):
diff --git a/bpython/test/test_history.py b/bpython/test/test_history.py
@@ -1,11 +1,7 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 from six.moves import range
 
 from bpython.history import History
+from bpython.test import unittest
 
 
 class TestHistory(unittest.TestCase):
diff --git a/bpython/test/test_importcompletion.py b/bpython/test/test_importcompletion.py
@@ -1,11 +1,7 @@
 from __future__ import unicode_literals
 
 from bpython import importcompletion
-
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
+from bpython.test import unittest
 
 
 class TestSimpleComplete(unittest.TestCase):
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -2,16 +2,13 @@
 
 import os
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 from bpython import inspection
+from bpython.test import unittest
 from bpython.test.fodder import encoding_ascii
 from bpython.test.fodder import encoding_latin1
 from bpython.test.fodder import encoding_utf8
 
+
 foo_ascii_only = u'''def foo():
     """Test"""
     pass
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -5,24 +5,21 @@
 import linecache
 import sys
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 from curtsies.fmtfuncs import bold, green, magenta, cyan, red, plain
 
 from bpython.curtsiesfrontend import interpreter
 from bpython._py3compat import py3
-from bpython.test import mock
+from bpython.test import mock, unittest
 
 pypy = 'PyPy' in sys.version
 
+
 def _last_console_filename():
     """Returns the last 'filename' used for console input
     (as will be displayed in a traceback)."""
     return '<bpython-input-%s>' % (len(linecache.cache.bpython_history) - 1)
 
+
 class TestInterpreter(unittest.TestCase):
     def test_syntaxerror(self):
         i = interpreter.Interp()
diff --git a/bpython/test/test_keys.py b/bpython/test/test_keys.py
@@ -1,9 +1,5 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
-import bpython.keys as keys
+from bpython import keys
+from bpython.test import unittest
 
 
 class TestCLIKeys(unittest.TestCase):
diff --git a/bpython/test/test_line_properties.py b/bpython/test/test_line_properties.py
@@ -1,10 +1,6 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 import re
 
+from bpython.test import unittest
 from bpython.line import current_word, current_dict_key, current_dict, \
     current_string, current_object, current_object_attribute, \
     current_from_import_from, current_from_import_import, current_import, \
diff --git a/bpython/test/test_manual_readline.py b/bpython/test/test_manual_readline.py
@@ -1,14 +1,10 @@
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 from bpython.curtsiesfrontend.manual_readline import \
     left_arrow, right_arrow, beginning_of_line, forward_word, back_word, \
     end_of_line, delete, last_word_pos, backspace, delete_from_cursor_back, \
     delete_from_cursor_forward, delete_rest_of_word, delete_word_to_cursor, \
     transpose_character_before_cursor, UnconfiguredEdits, \
     delete_word_from_cursor_back
+from bpython.test import unittest
 
 
 class TestManualReadline(unittest.TestCase):
diff --git a/bpython/test/test_preprocess.py b/bpython/test/test_preprocess.py
@@ -4,17 +4,13 @@
 import inspect
 import re
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-skip = unittest.skip
-
 from bpython.curtsiesfrontend.interpreter import code_finished_will_parse
 from bpython.curtsiesfrontend.preprocess import preprocess
+from bpython.test import unittest
+from bpython.test.fodder import original, processed
 
-from bpython.test.fodder import original as original, processed
 
+skip = unittest.skip
 preproc = partial(preprocess, compiler=compiler)
 
 
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -8,17 +8,15 @@
 from six.moves import range
 import sys
 
-try:
-    import unittest2 as unittest
-except ImportError:
-    import unittest
-
 from bpython._py3compat import py3
 from bpython import config, repl, cli, autocomplete
 from bpython.test import MagicIterMock, mock, FixLanguageTestCase as TestCase
+from bpython.test import unittest
+
 
 pypy = 'PyPy' in sys.version
 
+
 def setup_config(conf):
     config_struct = config.Struct()
     config.loadini(config_struct, os.devnull)
