FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Clean up unittest imports · pythonthings/bpython@dbd8066 · GitHub

/ bpython Public
forked from bpython/bpython

Commit dbd8066

Browse files
sebastinas
committed
Clean up unittest imports
Signed-off-by: Sebastian Ramacher <sebastian+dev@ramacher.at>
1 parent a8787b3 commit dbd8066

16 files changed

Lines changed: 24 additions & 83 deletions

‎bpython/autocomplete.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -488,7 +488,7 @@ def matches(self, cursor_offset, line, **kwargs):
488488
self._orig_start = None
489489
return None
490490
except IndexError:
491-
# for https://github.com/bpython/bpython/issues/483
491+
# for #483
492492
self._orig_start = None
493493
return None
494494

‎bpython/test/test_config.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,7 @@
22
import tempfile
33
import textwrap
44

5-
try:
6-
import unittest2 as unittest
7-
except ImportError:
8-
import unittest
9-
5+
from bpython.test import unittest
106
from bpython import config
117

128
TEST_THEME_PATH = os.path.join(os.path.dirname(__file__), "test.theme")

‎bpython/test/test_crashers.py‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,7 @@
66
import termios
77
import textwrap
88

9-
try:
10-
import unittest2 as unittest
11-
except ImportError:
12-
import unittest
9+
from bpython.test import unittest
1310

1411
try:
1512
from twisted.internet import reactor

‎bpython/test/test_curtsies_coderunner.py‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
import sys
22

3-
from bpython.test import mock
4-
5-
try:
6-
import unittest2 as unittest
7-
except ImportError:
8-
import unittest
9-
3+
from bpython.test import mock, unittest
104
from bpython.curtsiesfrontend.coderunner import CodeRunner, FakeOutput
115

126

‎bpython/test/test_curtsies_parser.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
from __future__ import unicode_literals
22

3-
try:
4-
import unittest2 as unittest
5-
except ImportError:
6-
import unittest
7-
3+
from bpython.test import unittest
84
from bpython.curtsiesfrontend import parse
95
from curtsies.fmtfuncs import yellow, cyan, green, bold
106

‎bpython/test/test_curtsies_repl.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@
99
from contextlib import contextmanager
1010
from six.moves import StringIO
1111

12-
try:
13-
import unittest2 as unittest
14-
except ImportError:
15-
import unittest
16-
1712
from bpython.curtsiesfrontend import repl as curtsiesrepl
1813
from bpython.curtsiesfrontend import interpreter
1914
from bpython.curtsiesfrontend import events as bpythonevents
@@ -22,7 +17,7 @@
2217
from bpython import args
2318
from bpython._py3compat import py3
2419
from bpython.test import (FixLanguageTestCase as TestCase, MagicIterMock, mock,
25-
builtin_target)
20+
builtin_target, unittest)
2621

2722

2823
def setup_config(conf):

‎bpython/test/test_filewatch.py‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,13 @@
11
import os
22

3-
try:
4-
import unittest2 as unittest
5-
except ImportError:
6-
import unittest
7-
83
try:
94
import watchdog
105
from bpython.curtsiesfrontend.filewatch import ModuleChangedEventHandler
116
has_watchdog = True
127
except ImportError:
138
has_watchdog = False
149

15-
from bpython.test import mock
10+
from bpython.test import mock, unittest
1611

1712
@unittest.skipUnless(has_watchdog, "watchdog required")
1813
class TestModuleChangeEventHandler(unittest.TestCase):

‎bpython/test/test_history.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
1-
try:
2-
import unittest2 as unittest
3-
except ImportError:
4-
import unittest
5-
61
from six.moves import range
72

83
from bpython.history import History
4+
from bpython.test import unittest
95

106

117
class TestHistory(unittest.TestCase):

‎bpython/test/test_importcompletion.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
from __future__ import unicode_literals
22

33
from bpython import importcompletion
4-
5-
try:
6-
import unittest2 as unittest
7-
except ImportError:
8-
import unittest
4+
from bpython.test import unittest
95

106

117
class TestSimpleComplete(unittest.TestCase):

‎bpython/test/test_inspection.py‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,13 @@
22

33
import os
44

5-
try:
6-
import unittest2 as unittest
7-
except ImportError:
8-
import unittest
9-
105
from bpython import inspection
6+
from bpython.test import unittest
117
from bpython.test.fodder import encoding_ascii
128
from bpython.test.fodder import encoding_latin1
139
from bpython.test.fodder import encoding_utf8
1410

11+
1512
foo_ascii_only = u'''def foo():
1613
"""Test"""
1714
pass

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL