tyler.durden
/
powerline
mirror of https://github.com/powerline/powerline.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-ipython' into develop

This commit is contained in:
Foo 2017-02-05 13:43:35 +03:00
parent 0240643071 5b9487e27b
commit 908c575223
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
powerline/bindings/ipython/since_5.py
View File

@ -23,7 +23,8 @@ class ConfigurableIPythonPowerline(IPythonPowerline):
def do_setup(self, ip, prompts, shutdown_hook):
prompts.powerline = self
saved_msfn = ip._make_style_from_name
msfn_missing = ()
saved_msfn = getattr(ip, '_make_style_from_name', msfn_missing)
if hasattr(saved_msfn, 'powerline_original'):
saved_msfn = saved_msfn.powerline_original
@ -43,7 +44,8 @@ class ConfigurableIPythonPowerline(IPythonPowerline):
_saved_msfn = saved_msfn
saved_msfn = lambda: _saved_msfn(ip)
ip._make_style_from_name = _make_style_from_name
if saved_msfn is not msfn_missing:
ip._make_style_from_name = _make_style_from_name
magics = PowerlineMagics(ip, self)
ip.register_magics(magics)