Import unittest and mock directly

sebastinas · sebastinas · commit bd277b645417 · 2020-12-30T23:15:21.000+01:00
diff --git a/bpython/test/__init__.py b/bpython/test/__init__.py
@@ -1,9 +1,8 @@
 import unittest
-import builtins
-from unittest import mock
+import unittest.mock
+import os
 
 from bpython.translations import init
-import os
 
 
 class FixLanguageTestCase(unittest.TestCase):
@@ -12,14 +11,9 @@ def setUpClass(cls):
         init(languages=["en"])
 
 
-class MagicIterMock(mock.MagicMock):
+class MagicIterMock(unittest.mock.MagicMock):
 
     __next__ = mock.Mock(return_value=None)
 
 
-def builtin_target(obj):
-    """Returns mock target string of a builtin"""
-    return f"{builtins.__name__}.{obj.__name__}"
-
-
 TEST_CONFIG = os.path.join(os.path.dirname(__file__), "test.config")
diff --git a/bpython/test/test_args.py b/bpython/test/test_args.py
@@ -2,10 +2,11 @@
 import subprocess
 import sys
 import tempfile
-from textwrap import dedent
+import unittest
 
+from textwrap import dedent
 from bpython import args
-from bpython.test import FixLanguageTestCase as TestCase, unittest
+from bpython.test import FixLanguageTestCase as TestCase
 
 
 class TestExecArgs(unittest.TestCase):
diff --git a/bpython/test/test_autocomplete.py b/bpython/test/test_autocomplete.py
@@ -2,6 +2,7 @@
 import keyword
 import unittest
 from collections import namedtuple
+from unittest import mock
 
 try:
     import jedi
@@ -11,7 +12,6 @@
     has_jedi = False
 
 from bpython import autocomplete
-from bpython.test import mock
 
 glob_function = "glob.iglob"
 
diff --git a/bpython/test/test_config.py b/bpython/test/test_config.py
@@ -1,8 +1,8 @@
 import os
 import tempfile
 import textwrap
+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
@@ -5,8 +5,9 @@
 import sys
 import termios
 import textwrap
+import unittest
 
-from bpython.test import unittest, TEST_CONFIG
+from bpython.test import TEST_CONFIG
 from bpython.config import getpreferredencoding
 
 try:
diff --git a/bpython/test/test_curtsies.py b/bpython/test/test_curtsies.py
@@ -1,7 +1,8 @@
-from collections import namedtuple
+import unittest
 
+from collections import namedtuple
 from bpython.curtsies import combined_events
-from bpython.test import FixLanguageTestCase as TestCase, unittest
+from bpython.test import FixLanguageTestCase as TestCase
 
 import curtsies.events
 
diff --git a/bpython/test/test_curtsies_coderunner.py b/bpython/test/test_curtsies_coderunner.py
@@ -1,6 +1,7 @@
 import sys
+import unittest
 
-from bpython.test import mock, unittest
+from unittest import mock
 from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
 
 
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -2,13 +2,13 @@
 import pydoc
 import string
 import sys
-from contextlib import contextmanager
 
+from contextlib import contextmanager
 from curtsies.formatstringarray import FormatStringTest, fsarray
 from curtsies.fmtfuncs import cyan, bold, green, yellow, on_magenta, red
+from unittest import mock
 
 from bpython.curtsiesfrontend.events import RefreshRequestEvent
-from bpython.test import mock
 from bpython import config, inspection
 from bpython.curtsiesfrontend.repl import BaseRepl
 from bpython.curtsiesfrontend import replpainter
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -3,8 +3,11 @@
 import sys
 import tempfile
 import io
-from functools import partial
+import unittest
+
 from contextlib import contextmanager
+from functools import partial
+from unittest import mock
 
 from bpython.curtsiesfrontend import repl as curtsiesrepl
 from bpython.curtsiesfrontend import interpreter
@@ -16,8 +19,6 @@
 from bpython.test import (
     FixLanguageTestCase as TestCase,
     MagicIterMock,
-    mock,
-    unittest,
     TEST_CONFIG,
 )
 
diff --git a/bpython/test/test_filewatch.py b/bpython/test/test_filewatch.py
@@ -1,4 +1,5 @@
 import os
+import unittest
 
 try:
     import watchdog
@@ -8,7 +9,7 @@
 except ImportError:
     has_watchdog = False
 
-from bpython.test import mock, unittest
+from unittest import mock
 
 
 @unittest.skipUnless(has_watchdog, "watchdog required")
diff --git a/bpython/test/test_history.py b/bpython/test/test_history.py
@@ -1,9 +1,8 @@
 import os
-
+import unittest
 
 from bpython.config import getpreferredencoding
 from bpython.history import History
-from bpython.test import unittest
 
 
 class TestHistory(unittest.TestCase):
diff --git a/bpython/test/test_import_not_cyclical.py b/bpython/test/test_import_not_cyclical.py
@@ -1,7 +1,7 @@
 import os
 import tempfile
+import unittest
 
-from bpython.test import unittest
 from bpython.importcompletion import ModuleGatherer
 
 
diff --git a/bpython/test/test_importcompletion.py b/bpython/test/test_importcompletion.py
@@ -1,5 +1,6 @@
+import unittest
+
 from bpython.importcompletion import ModuleGatherer
-from bpython.test import unittest
 
 
 class TestSimpleComplete(unittest.TestCase):
diff --git a/bpython/test/test_inspection.py b/bpython/test/test_inspection.py
@@ -1,7 +1,7 @@
 import os
+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
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -1,10 +1,11 @@
 import sys
 import re
+import unittest
 
 from curtsies.fmtfuncs import bold, green, magenta, cyan, red, plain
+from unittest import mock
 
 from bpython.curtsiesfrontend import interpreter
-from bpython.test import mock, unittest
 
 pypy = "PyPy" in sys.version
 
diff --git a/bpython/test/test_keys.py b/bpython/test/test_keys.py
@@ -1,5 +1,6 @@
+import unittest
+
 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,6 +1,6 @@
 import re
+import unittest
 
-from bpython.test import unittest
 from bpython.line import (
     current_word,
     current_dict_key,
diff --git a/bpython/test/test_manual_readline.py b/bpython/test/test_manual_readline.py
@@ -1,3 +1,5 @@
+import unittest
+
 from bpython.curtsiesfrontend.manual_readline import (
     left_arrow,
     right_arrow,
@@ -16,7 +18,6 @@
     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
@@ -1,16 +1,16 @@
-from code import compile_command as compiler
-from functools import partial
 import difflib
 import inspect
 import re
+import unittest
+
+from code import compile_command as compiler
+from functools import partial
 
 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
 
 
-skip = unittest.skip
 preproc = partial(preprocess, compiler=compiler)
 
 
@@ -85,14 +85,14 @@ def test_empty_line_within_class(self):
     def test_blank_lines_in_for_loop(self):
         self.assertIndented("blank_lines_in_for_loop")
 
-    @skip(
+    @unittest.skip(
         "More advanced technique required: need to try compiling and "
         "backtracking"
     )
     def test_blank_line_in_try_catch(self):
         self.assertIndented("blank_line_in_try_catch")
 
-    @skip(
+    @unittest.skip(
         "More advanced technique required: need to try compiling and "
         "backtracking"
     )
diff --git a/bpython/test/test_repl.py b/bpython/test/test_repl.py
@@ -1,15 +1,18 @@
-from itertools import islice
 import collections
 import inspect
 import os
 import shutil
 import socket
 import sys
 import tempfile
+import unittest
+
+from itertools import islice
+from unittest import mock
 
 from bpython import config, repl, cli, autocomplete
-from bpython.test import MagicIterMock, mock, FixLanguageTestCase as TestCase
-from bpython.test import unittest, TEST_CONFIG
+from bpython.test import MagicIterMock, FixLanguageTestCase as TestCase
+from bpython.test import TEST_CONFIG
 
 
 pypy = "PyPy" in sys.version
diff --git a/bpython/test/test_simpleeval.py b/bpython/test/test_simpleeval.py
@@ -1,13 +1,13 @@
 import ast
 import numbers
 import sys
+import unittest
 
 from bpython.simpleeval import (
     simple_eval,
     evaluate_current_expression,
     EvaluationError,
 )
-from bpython.test import unittest
 
 
 class TestSimpleEval(unittest.TestCase):
