Use the same unittest2 import block everywhere

sebastinas · sebastinas · commit 0b15a0b58f19 · 2015-01-22T22:29:23.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/test/test_args.py b/bpython/test/test_args.py
@@ -1,9 +1,12 @@
-import unittest
 import subprocess
 import sys
 import tempfile
 from textwrap import dedent
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 class TestExecArgs(unittest.TestCase):
     def test_exec_dunder_file(self):
diff --git a/bpython/test/test_config.py b/bpython/test/test_config.py
@@ -1,8 +1,12 @@
 import os
-import unittest
 import tempfile
 import textwrap
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from bpython import config
 
 TEST_THEME_PATH = os.path.join(os.path.dirname(__file__), "test.theme")
diff --git a/bpython/test/test_curtsies_coderunner.py b/bpython/test/test_curtsies_coderunner.py
@@ -1,6 +1,10 @@
-import unittest
 import sys
 
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
 
 class TestCodeRunner(unittest.TestCase):
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -5,10 +5,9 @@
 from contextlib import contextmanager
 
 try:
-    from unittest import skip
+    import unittest2 as unittest
 except ImportError:
-    def skip(f):
-        return lambda self: None
+    import unittest
 
 from curtsies.formatstringarray import FormatStringTest, fsarray
 from curtsies.fmtfuncs import *
diff --git a/bpython/test/test_curtsies_parser.py b/bpython/test/test_curtsies_parser.py
@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    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
@@ -13,14 +13,12 @@
 except ImportError:
     import unittest
 
-
-py3 = (sys.version_info[0] == 3)
-
 from bpython.curtsiesfrontend import repl as curtsiesrepl
 from bpython.curtsiesfrontend import interpreter
 from bpython import autocomplete
 from bpython import config
 from bpython import args
+from bpython._py3compat import py3
 
 def setup_config(conf):
     config_struct = config.Struct()
diff --git a/bpython/test/test_importcompletion.py b/bpython/test/test_importcompletion.py
@@ -1,6 +1,10 @@
 from bpython import importcompletion
 
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 
 class TestSimpleComplete(unittest.TestCase):
 
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from bpython import inspection
 
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -1,4 +1,7 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
 
 from bpython.curtsiesfrontend import interpreter
 from curtsies.fmtfuncs import *
@@ -10,7 +13,7 @@ def test_syntaxerror(self):
 
         def append_to_a(message):
             a.append(message)
-        
+
         i.write = append_to_a
         i.runsource('1.1.1.1')
 
@@ -25,7 +28,7 @@ def test_traceback(self):
 
         def append_to_a(message):
             a.append(message)
-        
+
         i.write = append_to_a
 
         def f():
diff --git a/bpython/test/test_keys.py b/bpython/test/test_keys.py
@@ -1,4 +1,8 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 import bpython.keys as keys
 
 class TestCLIKeys(unittest.TestCase):
diff --git a/bpython/test/test_line_properties.py b/bpython/test/test_line_properties.py
@@ -1,7 +1,15 @@
-import unittest
+try:
+    import unittest2 as unittest
+except ImportError:
+    import unittest
+
 import re
 
-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, current_method_definition_name, current_single_word, current_string_literal_attr
+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, \
+        current_method_definition_name, current_single_word, \
+        current_string_literal_attr
 
 
 def cursor(s):
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -2,7 +2,6 @@
 from itertools import islice
 import os
 import socket
-import sys
 
 from mock import Mock, MagicMock
 
@@ -11,8 +10,7 @@
 except ImportError:
     import unittest
 
-py3 = (sys.version_info[0] == 3)
-
+from bpython._py3compat import py3
 from bpython import config, repl, cli, autocomplete
 
 
