From 6ecba94b9abd089e7d01a3f92d41799662dceda7 Mon Sep 17 00:00:00 2001 From: ZyX Date: Sun, 21 Apr 2013 00:38:26 +0400 Subject: [PATCH] Added missing pl argument It is a problem with git automatic merging. --- powerline/segment.py | 2 +- powerline/theme.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/powerline/segment.py b/powerline/segment.py index 497242e2..c96f1c0e 100644 --- a/powerline/segment.py +++ b/powerline/segment.py @@ -45,7 +45,7 @@ segment_getters = { } -def gen_segment_getter(ext, path, theme_configs, default_module=None): +def gen_segment_getter(pl, ext, path, theme_configs, default_module=None): data = { 'default_module': default_module or 'powerline.segments.' + ext, 'path': path, diff --git a/powerline/theme.py b/powerline/theme.py index 2e3a3533..56a2a1bb 100644 --- a/powerline/theme.py +++ b/powerline/theme.py @@ -44,7 +44,7 @@ class Theme(object): theme_configs = [theme_config] if top_theme_config: theme_configs.append(top_theme_config) - get_segment = gen_segment_getter(ext, common_config['paths'], theme_configs, theme_config.get('default_module')) + get_segment = gen_segment_getter(pl, ext, common_config['paths'], theme_configs, theme_config.get('default_module')) for side in ['left', 'right']: for segment in theme_config['segments'].get(side, []): segment = get_segment(segment, side)