Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Compatibility for IPython 3.0

Browse Source
This commit is contained in:
Kovid Goyal 2015-08-23 13:04:26 +05:30
parent 53d452ae52
commit 0bb0c21dda
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/calibre/utils/ipython.py
View File

@ -118,23 +118,23 @@ history_length(2000) #value of -1 means no limit
pyreadline.rlmain.config_path = conf pyreadline.rlmain.config_path = conf
import readline, atexit import readline, atexit
import pyreadline.unicode_helper # noqa import pyreadline.unicode_helper # noqa
#Normally the codepage for pyreadline is set to be sys.stdout.encoding # Normally the codepage for pyreadline is set to be sys.stdout.encoding
#if you need to change this uncomment the following line # if you need to change this uncomment the following line
#pyreadline.unicode_helper.pyreadline_codepage="utf8" # pyreadline.unicode_helper.pyreadline_codepage="utf8"
except ImportError: except ImportError:
print("Module readline not available.") print("Module readline not available.")
else: else:
#import tab completion functionality # import tab completion functionality
import rlcompleter import rlcompleter
#Override completer from rlcompleter to disable automatic ( on callable # Override completer from rlcompleter to disable automatic ( on callable
completer_obj = rlcompleter.Completer() completer_obj = rlcompleter.Completer()
def nop(val, word): def nop(val, word):
return word return word
completer_obj._callable_postfix = nop completer_obj._callable_postfix = nop
readline.set_completer(completer_obj.complete) readline.set_completer(completer_obj.complete)
#activate tab completion # activate tab completion
readline.parse_and_bind("tab: complete") readline.parse_and_bind("tab: complete")
readline.read_history_file() readline.read_history_file()
atexit.register(readline.write_history_file) atexit.register(readline.write_history_file)
@ -161,7 +161,10 @@ def simple_repl(user_ns={}):
def ipython(user_ns=None): def ipython(user_ns=None):
try: try:
import IPython import IPython
from IPython.config.loader import Config try:
from traitlets.config import Config
except ImportError:
from IPython.config.loader import Config
except ImportError: except ImportError:
return simple_repl(user_ns=user_ns) return simple_repl(user_ns=user_ns)
defns = {'os':os, 're':re, 'sys':sys} defns = {'os':os, 're':re, 'sys':sys}
@ -193,4 +196,3 @@ def ipython(user_ns=None):
c.PrefilterManager.multi_line_specials = True c.PrefilterManager.multi_line_specials = True
IPython.embed(config=c, user_ns=user_ns) IPython.embed(config=c, user_ns=user_ns)