A few small fixes so ipythonx works, and PEP-8 cleanups I found along the way.

IPython/core/iplib.py

@@ -382,6 +382,7 b' class InteractiveShell(Component, Magic):'
         self.hooks.late_startup_hook()
 
     def get_ipython(self):
+        """Return the currently running IPython instance."""
         return self
 
     #-------------------------------------------------------------------------

IPython/core/ultratb.py

@@ -263,7 +263,7 b' def _fixed_getinnerframes(etb, context=1,tb_offset=0):'
 
 _parser = PyColorize.Parser()
     
-def _formatTracebackLines(lnum, index, lines, Colors, lvals=None,scheme=None):
+def _format_traceback_lines(lnum, index, lines, Colors, lvals=None,scheme=None):
     numbers_width = INDENT_SIZE - 1
     res = []
     i = lnum - index
@@ -781,8 +781,8 b' class VerboseTB(TBTools):'
                 frames.append(level)
             else:
                 frames.append('%s%s' % (level,''.join(
-                    _formatTracebackLines(lnum,index,lines,Colors,lvals,
-                                          col_scheme))))
+                    _format_traceback_lines(lnum,index,lines,Colors,lvals,
+                                            col_scheme))))
 
         # Get (safely) a string form of the exception info
         try:

IPython/frontend/prefilterfrontend.py

@@ -130,7 +130,7 b' class PrefilterFrontEnd(LineFrontEndBase):'
 
 
         if not 'banner' in kwargs and self.banner is None:
-            self.banner = self.ipython0.BANNER
+            self.banner = self.ipython0.banner
 
         # FIXME: __init__ and start should be two different steps
         self.start()

IPython/kernel/core/interpreter.py

@@ -211,7 +211,7 b' class Interpreter(object):'
 
     #### Public 'Interpreter' interface ########################################
 
-    def formatTraceback(self, et, ev, tb, message=''):
+    def format_traceback(self, et, ev, tb, message=''):
         """Put a formatted version of the traceback into value and reraise.
         
         When exceptions have to be sent over the network, the traceback 
@@ -375,7 +375,6 b' class Interpreter(object):'
             exec code in self.user_ns
             outflag = 0
         except SystemExit:
-            self.resetbuffer()
             self.traceback_trap.args = sys.exc_info()
         except:
             self.traceback_trap.args = sys.exc_info()
@@ -395,7 +394,7 b' class Interpreter(object):'
             python = self.translator(python)
         self.execute_python(python)
 
-    def getCommand(self, i=None):
+    def get_command(self, i=None):
         """Gets the ith message in the message_cache.
         
         This is implemented here for compatibility with the old ipython1 shell

IPython/kernel/engineservice.py

@@ -387,7 +387,7 b' class EngineService(object, service.Service):'
             # tb=traceback object
             et,ev,tb = sys.exc_info()
             # This call adds attributes to the exception value
-            et,ev,tb = self.shell.formatTraceback(et,ev,tb,msg)
+            et,ev,tb = self.shell.format_traceback(et,ev,tb,msg)
             # Add another attribute
             ev._ipython_engine_info = msg
             f = failure.Failure(ev,et,None)
@@ -444,7 +444,7 b' class EngineService(object, service.Service):'
         msg = {'engineid':self.id,
                'method':'get_result',
                'args':[repr(i)]}
-        d = self.executeAndRaise(msg, self.shell.getCommand, i)
+        d = self.executeAndRaise(msg, self.shell.get_command, i)
         d.addCallback(self.addIDToResult)
         return d
     
@@ -877,7 +877,7 b' class ThreadedEngineService(EngineService):'
             # tb=traceback object
             et,ev,tb = sys.exc_info()
             # This call adds attributes to the exception value
-            et,ev,tb = self.shell.formatTraceback(et,ev,tb,msg)
+            et,ev,tb = self.shell.format_traceback(et,ev,tb,msg)
             # Add another attribute
             
             # Create a new exception with the new attributes

IPython/testing/iptest.py

@@ -228,9 +228,8 b' class IPTester(object):'
             except OSError:
                 # This is just a best effort, if we fail or the process was
                 # really gone, ignore it.
-                pass
-            
-        
+                pass     
+
 
 def make_runners():
     """Define the top-level packages that need to be tested.