upstream/ipython Files · IPython/utils/rlineimpl.py

Move crash handling to the application level and simplify class structure....

Move crash handling to the application level and simplify class structure. Starting to try to take real advantage of the refactoring, to have generic crash handling. This also lets us initialize the app without needing all the self.attempt() wrappers, since now there's a good system-wide crash handler at the app level (not inside the shell instance). I didn't yet remove the attempt() method because we may have occasional uses for it (we still do, but in one place only). I also removed some extra class layers that weren't quite needed. Creating classes solely for the purpose of passing parameters makes the code (IMO) harder to understand, I kept getting lost in parts of the class hierarchy. I think these changes provide the same flexibility but with easier to follow code (less things to remember, basically). What I tried to do was to use argument passing instead of inheritance for all cases I saw where the inheritance wasn't really adding new functionality. In some cases, this actually allowed me to remove methods that were effectively duplicated in the subclasses.

Brian Granger - - Load All Authors

File last commit:

r2044:cc9fa6af


                r2403:08d6ac78

Download file

             rlineimpl.py
        
                    55 lines
            
             | 1.7 KiB
            
                | text/x-python
            
             |
                PythonLexer
            
             / IPython / utils / rlineimpl.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # -*- coding: utf-8 -*-

      """ Imports and provides the 'correct' version of readline for the platform.

      Readline is used throughout IPython as 'import IPython.utils.rlineimpl as readline'.

      In addition to normal readline stuff, this module provides have_readline

      boolean and _outputfile variable used in genutils.

      """

      import sys

      try:

          from readline import *

          import readline as _rl

          have_readline = True

      except ImportError:

          try:

              from pyreadline import *

              import pyreadline as _rl

              have_readline = True

          except ImportError:    

              have_readline = False

      if sys.platform == 'win32' and have_readline:

          try:

              _outputfile=_rl.GetOutputFile()

          except AttributeError:

              print "Failed GetOutputFile"

              have_readline = False

      # Test to see if libedit is being used instead of GNU readline.

      # Thanks to Boyd Waters for this patch.

      uses_libedit = False

      if sys.platform == 'darwin' and have_readline:

          import commands

          (status, result) = commands.getstatusoutput( "otool -L %s | grep libedit" % _rl.__file__ )

          if status == 0 and len(result) > 0:

              # we are bound to libedit - new in Leopard

              _rl.parse_and_bind("bind ^I rl_complete")

              print "Leopard libedit detected."

              uses_libedit = True

      # the clear_history() function was only introduced in Python 2.4 and is

      # actually optional in the readline API, so we must explicitly check for its

      # existence.  Some known platforms actually don't have it.  This thread:

      # http://mail.python.org/pipermail/python-dev/2003-August/037845.html

      # has the original discussion.

      if have_readline:

          try:

              _rl.clear_history

          except AttributeError:

              def clear_history(): pass

              _rl.clear_history = clear_history

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# -- coding: utf-8 --
				""" Imports and provides the 'correct' version of readline for the platform.

				Readline is used throughout IPython as 'import IPython.utils.rlineimpl as readline'.

				In addition to normal readline stuff, this module provides have_readline
				boolean and _outputfile variable used in genutils.
				"""

				import sys

				try:
				from readline import *
				import readline as _rl
				have_readline = True
				except ImportError:
				try:
				from pyreadline import *
				import pyreadline as _rl
				have_readline = True
				except ImportError:
				have_readline = False

				if sys.platform == 'win32' and have_readline:
				try:
				_outputfile=_rl.GetOutputFile()
				except AttributeError:
				print "Failed GetOutputFile"
				have_readline = False

				# Test to see if libedit is being used instead of GNU readline.
				# Thanks to Boyd Waters for this patch.
				uses_libedit = False
				if sys.platform == 'darwin' and have_readline:
				import commands
				(status, result) = commands.getstatusoutput( "otool -L %s \| grep libedit" % _rl.__file__ )
				if status == 0 and len(result) > 0:
				# we are bound to libedit - new in Leopard
				_rl.parse_and_bind("bind ^I rl_complete")
				print "Leopard libedit detected."
				uses_libedit = True


				# the clear_history() function was only introduced in Python 2.4 and is
				# actually optional in the readline API, so we must explicitly check for its
				# existence. Some known platforms actually don't have it. This thread:
				# http://mail.python.org/pipermail/python-dev/2003-August/037845.html
				# has the original discussion.

				if have_readline:
				try:
				_rl.clear_history
				except AttributeError:
				def clear_history(): pass
				_rl.clear_history = clear_history