diff --git a/docs/source/configuration/local.rst b/docs/source/configuration/local.rst index f8f2ac27..462ab1e9 100644 --- a/docs/source/configuration/local.rst +++ b/docs/source/configuration/local.rst @@ -112,7 +112,7 @@ use ``c.Powerline.KEY``. Supported ``KEY`` strings or keyword argument names: a dictionary where keys are theme names and values are dictionaries which will be recursively merged with the contents of the given theme. -``paths`` +``config_paths`` Sets directories where configuration should be read from. If present, no default locations are searched for configuration. No expansions are performed thus you cannot use paths starting with ``~/``. diff --git a/powerline/bindings/ipython/post_0_11.py b/powerline/bindings/ipython/post_0_11.py index bf2358ac..3d8aea0d 100644 --- a/powerline/bindings/ipython/post_0_11.py +++ b/powerline/bindings/ipython/post_0_11.py @@ -72,7 +72,7 @@ class ConfigurableIPythonPowerline(IPythonPowerline): config = ip.config.Powerline self.config_overrides = config.get('config_overrides') self.theme_overrides = config.get('theme_overrides', {}) - self.paths = config.get('paths') + self.config_paths = config.get('config_paths') super(ConfigurableIPythonPowerline, self).init() def do_setup(self, ip, shutdown_hook): diff --git a/powerline/bindings/ipython/pre_0_11.py b/powerline/bindings/ipython/pre_0_11.py index 6e5e356d..fa34cd86 100644 --- a/powerline/bindings/ipython/pre_0_11.py +++ b/powerline/bindings/ipython/pre_0_11.py @@ -95,10 +95,10 @@ class PowerlinePrompt2(PowerlinePromptOut): class ConfigurableIPythonPowerline(IPythonPowerline): - def init(self, config_overrides=None, theme_overrides={}, paths=None): + def init(self, config_overrides=None, theme_overrides={}, config_paths=None): self.config_overrides = config_overrides self.theme_overrides = theme_overrides - self.paths = paths + self.config_paths = config_paths super(ConfigurableIPythonPowerline, self).init() def ipython_magic(self, ip, parameter_s=''): diff --git a/powerline/ipython.py b/powerline/ipython.py index 8c4ec991..6e22c41b 100644 --- a/powerline/ipython.py +++ b/powerline/ipython.py @@ -32,8 +32,8 @@ class IPythonPowerline(Powerline): ) def get_config_paths(self): - if self.paths: - return self.paths + if self.config_paths: + return self.config_paths else: return super(IPythonPowerline, self).get_config_paths() diff --git a/tests/test_provided_config_files.py b/tests/test_provided_config_files.py index 5a1982b0..00eec49c 100644 --- a/tests/test_provided_config_files.py +++ b/tests/test_provided_config_files.py @@ -148,7 +148,7 @@ class TestConfig(TestCase): from powerline.ipython import IPythonPowerline class IpyPowerline(IPythonPowerline): - paths = None + config_paths = None config_overrides = None theme_overrides = {}