From 5b9487e27b4fee619d7fe24f473b50b2c70efeee Mon Sep 17 00:00:00 2001 From: Foo Date: Sun, 5 Feb 2017 13:43:05 +0300 Subject: [PATCH 1/2] Make it work with ipython-5.2.2 Fixes #1709 --- powerline/bindings/ipython/since_5.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/powerline/bindings/ipython/since_5.py b/powerline/bindings/ipython/since_5.py index ab92d6d6..5a899ae8 100644 --- a/powerline/bindings/ipython/since_5.py +++ b/powerline/bindings/ipython/since_5.py @@ -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) From 4189862b8594f97b97ffa2d5102da91e3f21acc9 Mon Sep 17 00:00:00 2001 From: Foo Date: Sun, 5 Feb 2017 13:44:42 +0300 Subject: [PATCH 2/2] Update base version --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/setup.py b/setup.py index 260deb88..4c6236cc 100644 --- a/setup.py +++ b/setup.py @@ -59,7 +59,7 @@ else: def get_version(): - base_version = '2.5.1' + base_version = '2.5.2' base_version += '.dev9999' try: return base_version + '+git.' + str(subprocess.check_output(['git', 'rev-parse', 'HEAD']).strip())