Import clean up

sebastinas · sebastinas · commit aaa099885d0b · 2015-01-23T19:54:08.000+01:00
Signed-off-by: Sebastian Ramacher &lt;sebastian+dev@ramacher.at&gt;
diff --git a/bpython/curtsiesfrontend/_internal.py b/bpython/curtsiesfrontend/_internal.py
@@ -20,7 +20,6 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-import sys
 import pydoc
 
 import bpython._internal
diff --git a/bpython/curtsiesfrontend/coderunner.py b/bpython/curtsiesfrontend/coderunner.py
@@ -11,7 +11,6 @@
 
 import code
 import signal
-import sys
 import greenlet
 import logging
 
diff --git a/bpython/curtsiesfrontend/filewatch.py b/bpython/curtsiesfrontend/filewatch.py
@@ -1,4 +1,3 @@
-import time
 import os
 from collections import defaultdict
 
@@ -30,9 +29,7 @@ def reset(self):
             self.observer.unschedule_all()
 
         def _add_module(self, path):
-            """Add a python module to track changes to
-            
-            Can"""
+            """Add a python module to track changes"""
             path = os.path.abspath(path)
             for suff in importcompletion.SUFFIXES:
                 if path.endswith(suff):
@@ -45,7 +42,7 @@ def _add_module(self, path):
 
         def _add_module_later(self, path):
             self.modules_to_add_later.append(path)
-            
+
         def track_module(self, path):
             """
             Begins tracking this if activated, or remembers to track later.
diff --git a/bpython/curtsiesfrontend/preprocess.py b/bpython/curtsiesfrontend/preprocess.py
@@ -1,8 +1,6 @@
 """Tools for preparing code to be run in the REPL (removing blank lines, etc)"""
 import re
 
-from bpython.curtsiesfrontend.interpreter import code_finished_will_parse
-
 #TODO specifically catch IndentationErrors instead of any syntax errors
 
 def indent_empty_lines(s, compiler):
diff --git a/bpython/curtsiesfrontend/replpainter.py b/bpython/curtsiesfrontend/replpainter.py
@@ -172,7 +172,7 @@ def add_border(line):
     r = fsarray(output_lines[:min(rows-1, len(output_lines)-1)] + output_lines[-1:])
     return r
 
-def paint_last_events(rows, columns, names):
+def paint_last_events(rows, columns, names, config):
     if not names:
         return fsarray([])
     width = min(max(len(name) for name in names), columns-2)
diff --git a/bpython/test/test_curtsies_painting.py b/bpython/test/test_curtsies_painting.py
@@ -10,7 +10,7 @@
     import unittest
 
 from curtsies.formatstringarray import FormatStringTest, fsarray
-from curtsies.fmtfuncs import *
+from curtsies.fmtfuncs import cyan, bold, green, yellow, on_magenta, red
 from bpython.curtsiesfrontend.events import RefreshRequestEvent
 
 from bpython import config
diff --git a/bpython/test/test_curtsies_repl.py b/bpython/test/test_curtsies_repl.py
@@ -1,7 +1,6 @@
 # coding: utf8
 import code
 from contextlib import contextmanager
-from functools import partial
 from mock import Mock, patch, MagicMock
 import os
 from StringIO import StringIO
diff --git a/bpython/test/test_interpreter.py b/bpython/test/test_interpreter.py
@@ -4,7 +4,7 @@
     import unittest
 
 from bpython.curtsiesfrontend import interpreter
-from curtsies.fmtfuncs import *
+from curtsies.fmtfuncs import bold, green, magenta, cyan, red, plain
 
 class TestInterpreter(unittest.TestCase):
     def test_syntaxerror(self):
diff --git a/bpython/test/test_manual_readline.py b/bpython/test/test_manual_readline.py
@@ -3,7 +3,12 @@
 except ImportError:
     import unittest
 
-from bpython.curtsiesfrontend.manual_readline import *
+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
 
 
 class TestManualReadline(unittest.TestCase):
diff --git a/bpython/test/test_preprocess.py b/bpython/test/test_preprocess.py
@@ -3,7 +3,6 @@
 import difflib
 import inspect
 import re
-import unittest
 
 try:
     import unittest2 as unittest
