mirror of
https://github.com/powerline/powerline.git
synced 2025-07-27 15:54:30 +02:00
Do not override Powerline.setup(), use .do_setup() for this
Same reason as for `.__init__()` which was replaced by `.init()`
This commit is contained in:
parent
696f4d2357
commit
ff78eaa35c
@ -744,11 +744,21 @@ class Powerline(object):
|
|||||||
def setup(self, *args, **kwargs):
|
def setup(self, *args, **kwargs):
|
||||||
'''Setup the environment to use powerline.
|
'''Setup the environment to use powerline.
|
||||||
|
|
||||||
To be overridden by subclasses, this one only saves args and kwargs and
|
Must not be overridden by subclasses. This one only saves setup
|
||||||
unsets shutdown_event.
|
arguments for :py:meth:`reload` method and calls :py:meth:`do_setup`.
|
||||||
'''
|
'''
|
||||||
self.shutdown_event.clear()
|
self.shutdown_event.clear()
|
||||||
self.setup_args = (args, kwargs)
|
self.setup_args = (args, kwargs)
|
||||||
|
self.do_setup(*args, **kwargs)
|
||||||
|
|
||||||
|
@staticmethod
|
||||||
|
def do_setup():
|
||||||
|
'''Function that does initialization
|
||||||
|
|
||||||
|
Should be overridden by subclasses. May accept any number of regular or
|
||||||
|
keyword arguments.
|
||||||
|
'''
|
||||||
|
pass
|
||||||
|
|
||||||
def reload(self):
|
def reload(self):
|
||||||
'''Reload powerline after update.
|
'''Reload powerline after update.
|
||||||
|
@ -56,6 +56,5 @@ class IpythonPowerline(Powerline):
|
|||||||
mergedicts(r, self.theme_overrides[name])
|
mergedicts(r, self.theme_overrides[name])
|
||||||
return r
|
return r
|
||||||
|
|
||||||
def setup(self, attr, obj):
|
def do_setup(self, attr, obj):
|
||||||
setattr(obj, attr, self)
|
setattr(obj, attr, self)
|
||||||
super(IpythonPowerline, self).setup(attr, obj)
|
|
||||||
|
@ -43,9 +43,8 @@ class ShellPowerline(Powerline):
|
|||||||
for key, val in local_themes.items()
|
for key, val in local_themes.items()
|
||||||
))
|
))
|
||||||
|
|
||||||
def setup(self, obj):
|
def do_setup(self, obj):
|
||||||
obj.powerline = self
|
obj.powerline = self
|
||||||
super(ShellPowerline, self).setup(obj)
|
|
||||||
|
|
||||||
|
|
||||||
def get_argparser(parser=None, *args, **kwargs):
|
def get_argparser(parser=None, *args, **kwargs):
|
||||||
|
@ -110,8 +110,7 @@ class VimPowerline(Powerline):
|
|||||||
except KeyError:
|
except KeyError:
|
||||||
return super(VimPowerline, self).get_config_paths()
|
return super(VimPowerline, self).get_config_paths()
|
||||||
|
|
||||||
def setup(self, pyeval=None, pycmd=None, can_replace_pyeval=True):
|
def do_setup(self, pyeval=None, pycmd=None, can_replace_pyeval=True):
|
||||||
super(VimPowerline, self).setup()
|
|
||||||
import __main__
|
import __main__
|
||||||
if not pyeval:
|
if not pyeval:
|
||||||
pyeval = 'pyeval' if sys.version_info < (3,) else 'py3eval'
|
pyeval = 'pyeval' if sys.version_info < (3,) else 'py3eval'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user