cleanup and linted a bit :)

IPython/gui/wx/ipshell_nonblocking.py

@@ -21,15 +21,13 b' import re'
 import sys
 import os
 import locale
-import time
-import pydoc,__builtin__,site
 from thread_ex import ThreadEx
-from StringIO import StringIO
 
 try:
         import IPython
 except Exception,e:
-        raise "Error importing IPython (%s)" % str(e)
+    print "Error importing IPython (%s)" % str(e)
+    raise Exception, e
 
 ##############################################################################
 class _Helper(object):
@@ -46,10 +44,12 b' class _Helper(object):'
     
     def __call__(self, *args, **kwds):
         class DummyWriter(object):
+            '''Dumy class to handle help output'''	
             def __init__(self,pager):
                 self._pager = pager
                 
             def write(self,data):
+                '''hook to fill self._pager'''
                 self._pager(data)
 
         import pydoc
@@ -61,13 +61,14 b' class _Helper(object):'
   
 ##############################################################################
 class _CodeExecutor(ThreadEx):
-    
+    ''' Thread that execute ipython code '''
     def __init__(self, instance, after):
         ThreadEx.__init__(self)
         self.instance = instance
         self._afterExecute=after
 
     def run(self):
+        '''Thread main loop'''
         try:
             self.instance._doc_text = None
             self.instance._help_text = None
@@ -112,6 +113,8 b' class NonBlockingIPShell(object):'
         @type int
         '''
         #ipython0 initialisation
+        self._IP = None
+        self._term = None
         self.initIpython0(argv, user_ns, user_global_ns,
                           cin, cout, cerr,
                           ask_exit_handler)
@@ -134,6 +137,8 b' class NonBlockingIPShell(object):'
     def initIpython0(self, argv=[], user_ns={}, user_global_ns=None,
                      cin=None, cout=None, cerr=None,
                      ask_exit_handler=None):
+        ''' Initialize an ithon0 instance '''
+        
         #first we redefine in/out/error functions of IPython 
         if cin:
             IPython.Shell.Term.cin = cin
@@ -190,8 +195,8 b' class NonBlockingIPShell(object):'
 
         self._line_to_execute = line
         #we launch the ipython line execution in a thread to make it interruptible
-        self.ce = _CodeExecutor(self,self._afterExecute)
-        self.ce.start()
+        ce = _CodeExecutor(self, self._afterExecute)
+        ce.start()
         
     #----------------------- IPython management section ----------------------    
     def getDocText(self):
@@ -321,7 +326,8 b' class NonBlockingIPShell(object):'
         '''
         history = ''
         #the below while loop is used to suppress empty history lines
-        while((history == '' or history == '\n') and self._history_level <= self._getHistoryMaxIndex()):
+        while((history == '' or history == '\n') \
+        and self._history_level <= self._getHistoryMaxIndex()):
                 if self._history_level < self._getHistoryMaxIndex():
                         self._history_level += 1
                         history = self._getHistory()
@@ -375,8 +381,8 b' class NonBlockingIPShell(object):'
         '''
         This function is used as a callback replacment to IPython help pager function
 
-        It puts the 'text' value inside the self._help_text string that can be retrived via getHelpText
-        function.
+        It puts the 'text' value inside the self._help_text string that can be retrived via
+        getHelpText function.
         '''
         if self._help_text == None:
             self._help_text = text
@@ -387,8 +393,8 b' class NonBlockingIPShell(object):'
         '''
         This function is used as a callback replacment to IPython pager function
 
-        It puts the 'text' value inside the self._doc_text string that can be retrived via getDocText
-        function.
+        It puts the 'text' value inside the self._doc_text string that can be retrived via
+        getDocText function.
         '''
         self._doc_text = text
     
@@ -429,8 +435,7 b' class NonBlockingIPShell(object):'
             self._IP.showtraceback()
         else:
             self._iter_more = self._IP.push(line)
-            if (self._IP.SyntaxTB.last_syntax_error and
-                    self._IP.rc.autoedit_syntax):
+            if (self._IP.SyntaxTB.last_syntax_error and self._IP.rc.autoedit_syntax):
                 self._IP.edit_syntax_error()
         if self._iter_more:
             self._prompt = str(self._IP.outputcache.prompt2).strip()
@@ -452,8 +457,8 b' class NonBlockingIPShell(object):'
         '''
         stdin, stdout = os.popen4(cmd)
         result = stdout.read().decode('cp437').encode(locale.getpreferredencoding())
-        #we use print command because the shell command is called inside IPython instance and thus is
-        #redirected to thread cout
+        #we use print command because the shell command is called
+        #inside IPython instance and thus is redirected to thread cout
         #"\x01\x1b[1;36m\x02" <-- add colour to the text...
         print "\x01\x1b[1;36m\x02"+result
         stdout.close()

IPython/gui/wx/ipython_view.py

@@ -28,13 +28,7 b' import wx'
 import wx.stc  as  stc
 
 import re
-import sys
-import locale
 from StringIO import StringIO
-try:
-        import IPython
-except Exception,e:
-        raise "Error importing IPython (%s)" % str(e)
 
 from ipshell_nonblocking import NonBlockingIPShell
 
@@ -387,9 +381,7 b' class WxConsoleView(stc.StyledTextCtrl):'
             max_symbol =' '*max_len
             
             #now we check how much symbol we can put on a line...
-            cursor_pos = self.getCursorPos()
             test_buffer = max_symbol + ' '*4
-            current_lines = self.GetLineCount()
             
             allowed_symbols = 80/len(test_buffer)
             if allowed_symbols == 0:
@@ -462,7 +454,8 b' class WxConsoleView(stc.StyledTextCtrl):'
                 return True
             
             if skip:
-                if event.GetKeyCode() not in [wx.WXK_PAGEUP,wx.WXK_PAGEDOWN] and event.Modifiers == wx.MOD_NONE:
+                if event.GetKeyCode() not in [wx.WXK_PAGEUP, wx.WXK_PAGEDOWN]\
+                and event.Modifiers == wx.MOD_NONE:
                     self.moveCursorOnNewValidKey()
                     
                 event.Skip()