Cleanup imports.

Trundle · Trundle · commit 65508f46f744 · 2010-05-16T02:14:44.000+02:00
diff --git a/bpython/cli.py b/bpython/cli.py
@@ -30,7 +30,6 @@
 import math
 import re
 import time
-import inspect
 import signal
 import struct
 import termios
@@ -49,7 +48,6 @@
 from bpython.formatter import BPythonFormatter
 
 # This for completion
-from bpython import inspection
 from bpython import importcompletion
 
 # This for config
diff --git a/bpython/gtk_.py b/bpython/gtk_.py
@@ -33,9 +33,6 @@
 import os
 import sys
 from locale import LC_ALL, getpreferredencoding, setlocale
-from xmlrpclib import ServerProxy, Error as XMLRPCError
-from string import Template
-from urllib import quote as urlquote
 
 import gobject
 import gtk
diff --git a/bpython/inspection.py b/bpython/inspection.py
@@ -39,7 +39,6 @@
 except AttributeError:
     has_collections_callable = False
 try:
-    import types
     types.InstanceType
     has_instance_type = True
 except AttributeError:
diff --git a/bpython/urwid.py b/bpython/urwid.py
@@ -617,7 +617,7 @@ def reevaluate(self):
             if py3:
                 self.stdout_hist += line + '\n'
             else:
-                self.stdout_hist += line.encode(getpreferredencoding()) + '\n'
+                self.stdout_hist += line.encode(locale.getpreferredencoding()) + '\n'
             self.print_line(line)
             self.s_hist[-1] += self.f_string
 # I decided it was easier to just do this manually
@@ -628,7 +628,7 @@ def reevaluate(self):
             self.iy, self.ix = self.scr.getyx()
 
         self.cpos = 0
-        indent = next_indentation(self.s, self.config.tab_length)
+        indent = repl.next_indentation(self.s, self.config.tab_length)
         self.s = ''
         self.scr.refresh()
 
@@ -652,7 +652,7 @@ def write(self, s):
             t = s
 
         if not py3 and isinstance(t, unicode):
-            t = t.encode(getpreferredencoding())
+            t = t.encode(locale.getpreferredencoding())
 
         if not self.stdout_hist:
             self.stdout_hist = t
