From 282cb43eefc5a13f9a9f2960e9a059a369784d65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kim=20Silkeb=C3=A6kken?= Date: Wed, 20 Feb 2013 13:47:54 +0100 Subject: [PATCH] Fix various minor formatting issues Closes #242. --- powerline/bindings/ipython/pre_0_11.py | 2 +- powerline/colorscheme.py | 2 +- powerline/lib/vcs/__init__.py | 7 +- powerline/renderer.py | 2 +- powerline/renderers/shell.py | 2 +- powerline/segments/common.py | 96 +++++++++++++------------- powerline/segments/vim.py | 9 +-- powerline/theme.py | 3 +- setup.py | 3 +- 9 files changed, 65 insertions(+), 61 deletions(-) diff --git a/powerline/bindings/ipython/pre_0_11.py b/powerline/bindings/ipython/pre_0_11.py index f48e71a9..18fa8384 100644 --- a/powerline/bindings/ipython/pre_0_11.py +++ b/powerline/bindings/ipython/pre_0_11.py @@ -15,7 +15,7 @@ class PowerlinePrompt(BasePrompt): def auto_rewrite(self): # TODO color this - return '%s>%s' % ('-'*self.prompt_text_len, ' '*self.nrspaces) + return '%s>%s' % ('-' * self.prompt_text_len, ' ' * self.nrspaces) def setup(prompt='1'): diff --git a/powerline/colorscheme.py b/powerline/colorscheme.py index 4fbcfe8e..0f499a8b 100644 --- a/powerline/colorscheme.py +++ b/powerline/colorscheme.py @@ -5,8 +5,8 @@ ATTR_BOLD = 1 ATTR_ITALIC = 2 ATTR_UNDERLINE = 4 -class Colorscheme(object): +class Colorscheme(object): def __init__(self, colorscheme): '''Initialize a colorscheme.''' self.colors = {} diff --git a/powerline/lib/vcs/__init__.py b/powerline/lib/vcs/__init__.py index ce3a9d96..7bf396b9 100644 --- a/powerline/lib/vcs/__init__.py +++ b/powerline/lib/vcs/__init__.py @@ -3,6 +3,10 @@ import os from powerline.lib.memoize import memoize +vcs_props = (('git', '.git', os.path.exists), + ('mercurial', '.hg', os.path.isdir)) + + def generate_directories(path): yield path while True: @@ -13,9 +17,6 @@ def generate_directories(path): yield path -vcs_props = (('git', '.git', os.path.exists), - ('mercurial', '.hg', os.path.isdir)) - @memoize(100) def guess(path): for directory in generate_directories(path): diff --git a/powerline/renderer.py b/powerline/renderer.py index 75ec745a..17b7a738 100644 --- a/powerline/renderer.py +++ b/powerline/renderer.py @@ -42,7 +42,7 @@ class Renderer(object): theme.segment_info.update(segment_info) # Handle excluded/included segments for the current mode - segments = [segment for segment in segments\ + segments = [segment for segment in segments if mode not in segment['exclude_modes'] or (segment['include_modes'] and segment in segment['include_modes'])] segments = [segment for segment in self._render_segments(mode, theme, segments)] diff --git a/powerline/renderers/shell.py b/powerline/renderers/shell.py index a322ce4e..5c969756 100644 --- a/powerline/renderers/shell.py +++ b/powerline/renderers/shell.py @@ -43,7 +43,7 @@ class ShellRenderer(Renderer): if attr & ATTR_BOLD: ansi += [1] elif attr & ATTR_ITALIC: - # Note: is likely not to work or even be inverse in place of + # Note: is likely not to work or even be inverse in place of # italic. Omit using this in colorschemes. ansi += [3] elif attr & ATTR_UNDERLINE: diff --git a/powerline/segments/common.py b/powerline/segments/common.py index 03aad401..6f458d01 100644 --- a/powerline/segments/common.py +++ b/powerline/segments/common.py @@ -191,54 +191,54 @@ def uptime(format='{days:02d}d {hours:02d}h {minutes:02d}m'): # Weather condition code descriptions available at # http://developer.yahoo.com/weather/#codes weather_conditions_codes = ( - ('tornado', 'stormy'), # 0 - ('tropical_storm', 'stormy'), # 1 - ('hurricane', 'stormy'), # 2 - ('severe_thunderstorms', 'stormy'), # 3 - ('thunderstorms', 'stormy'), # 4 - ('mixed_rain_and_snow', 'rainy' ), # 5 - ('mixed_rain_and_sleet', 'rainy' ), # 6 - ('mixed_snow_and_sleet', 'snowy' ), # 7 - ('freezing_drizzle', 'rainy' ), # 8 - ('drizzle', 'rainy' ), # 9 - ('freezing_rain', 'rainy' ), # 10 - ('showers', 'rainy' ), # 11 - ('showers', 'rainy' ), # 12 - ('snow_flurries', 'snowy' ), # 13 - ('light_snow_showers', 'snowy' ), # 14 - ('blowing_snow', 'snowy' ), # 15 - ('snow', 'snowy' ), # 16 - ('hail', 'snowy' ), # 17 - ('sleet', 'snowy' ), # 18 - ('dust', 'foggy' ), # 19 - ('fog', 'foggy' ), # 20 - ('haze', 'foggy' ), # 21 - ('smoky', 'foggy' ), # 22 - ('blustery', 'foggy' ), # 23 - ('windy', ), # 24 - ('cold', 'day' ), # 25 - ('clouds', 'cloudy'), # 26 - ('mostly_cloudy_night', 'cloudy'), # 27 - ('mostly_cloudy_day', 'cloudy'), # 28 - ('partly_cloudy_night', 'cloudy'), # 29 - ('partly_cloudy_day', 'cloudy'), # 30 - ('clear_night', 'night' ), # 31 - ('sun', 'sunny' ), # 32 - ('fair_night', 'night' ), # 33 - ('fair_day', 'day' ), # 34 - ('mixed_rain_and_hail', 'rainy' ), # 35 - ('hot', 'sunny' ), # 36 - ('isolated_thunderstorms', 'stormy'), # 37 - ('scattered_thunderstorms', 'stormy'), # 38 - ('scattered_thunderstorms', 'stormy'), # 39 - ('scattered_showers', 'rainy' ), # 40 - ('heavy_snow', 'snowy' ), # 41 - ('scattered_snow_showers', 'snowy' ), # 42 - ('heavy_snow', 'snowy' ), # 43 - ('partly_cloudy', 'cloudy'), # 44 - ('thundershowers', 'rainy' ), # 45 - ('snow_showers', 'snowy' ), # 46 - ('isolated_thundershowers', 'rainy' ), # 47 + ('tornado', 'stormy'), # 0 + ('tropical_storm', 'stormy'), # 1 + ('hurricane', 'stormy'), # 2 + ('severe_thunderstorms', 'stormy'), # 3 + ('thunderstorms', 'stormy'), # 4 + ('mixed_rain_and_snow', 'rainy' ), # 5 + ('mixed_rain_and_sleet', 'rainy' ), # 6 + ('mixed_snow_and_sleet', 'snowy' ), # 7 + ('freezing_drizzle', 'rainy' ), # 8 + ('drizzle', 'rainy' ), # 9 + ('freezing_rain', 'rainy' ), # 10 + ('showers', 'rainy' ), # 11 + ('showers', 'rainy' ), # 12 + ('snow_flurries', 'snowy' ), # 13 + ('light_snow_showers', 'snowy' ), # 14 + ('blowing_snow', 'snowy' ), # 15 + ('snow', 'snowy' ), # 16 + ('hail', 'snowy' ), # 17 + ('sleet', 'snowy' ), # 18 + ('dust', 'foggy' ), # 19 + ('fog', 'foggy' ), # 20 + ('haze', 'foggy' ), # 21 + ('smoky', 'foggy' ), # 22 + ('blustery', 'foggy' ), # 23 + ('windy', ), # 24 + ('cold', 'day' ), # 25 + ('clouds', 'cloudy'), # 26 + ('mostly_cloudy_night', 'cloudy'), # 27 + ('mostly_cloudy_day', 'cloudy'), # 28 + ('partly_cloudy_night', 'cloudy'), # 29 + ('partly_cloudy_day', 'cloudy'), # 30 + ('clear_night', 'night' ), # 31 + ('sun', 'sunny' ), # 32 + ('fair_night', 'night' ), # 33 + ('fair_day', 'day' ), # 34 + ('mixed_rain_and_hail', 'rainy' ), # 35 + ('hot', 'sunny' ), # 36 + ('isolated_thunderstorms', 'stormy'), # 37 + ('scattered_thunderstorms', 'stormy'), # 38 + ('scattered_thunderstorms', 'stormy'), # 39 + ('scattered_showers', 'rainy' ), # 40 + ('heavy_snow', 'snowy' ), # 41 + ('scattered_snow_showers', 'snowy' ), # 42 + ('heavy_snow', 'snowy' ), # 43 + ('partly_cloudy', 'cloudy'), # 44 + ('thundershowers', 'rainy' ), # 45 + ('snow_showers', 'snowy' ), # 46 + ('isolated_thundershowers', 'rainy' ), # 47 ) # ('day', (25, 34)), # ('rainy', (5, 6, 8, 9, 10, 11, 12, 35, 40, 45, 47)), diff --git a/powerline/segments/vim.py b/powerline/segments/vim.py index c7a6dcda..d9c7f68c 100644 --- a/powerline/segments/vim.py +++ b/powerline/segments/vim.py @@ -6,7 +6,7 @@ import os try: import vim except ImportError: - vim = {} + vim = {} # NOQA from powerline.bindings.vim import vim_get_func, getbufvar from powerline.theme import requires_segment_info @@ -49,15 +49,16 @@ mode_translations = { } -eventcaches = defaultdict(lambda : []) -bufeventcaches = defaultdict(lambda : []) +eventcaches = defaultdict(lambda: []) +bufeventcaches = defaultdict(lambda: []) + + def purgeonevents_reg(events, eventcaches=bufeventcaches): def cache_reg_func(cache): for event in events: if event not in eventcaches: vim.eval('PowerlineRegisterCachePurgerEvent("' + event + '")') eventcaches[event].append(cache) - return cache_reg_func purgeall_on_shell = purgeonevents_reg(('ShellCmdPost', 'ShellFilterPost', 'FocusGained'), eventcaches=eventcaches) diff --git a/powerline/theme.py b/powerline/theme.py index 965ef81b..187c87d1 100644 --- a/powerline/theme.py +++ b/powerline/theme.py @@ -5,8 +5,9 @@ from copy import copy from .segment import Segment + try: - unicode() + unicode() # NOQA except NameError: unicode = str diff --git a/setup.py b/setup.py index 29101ea6..5600c5c2 100755 --- a/setup.py +++ b/setup.py @@ -11,7 +11,8 @@ try: except IOError: README = '' -setup(name='Powerline', +setup( + name='Powerline', version='beta', description='The ultimate statusline/prompt utility.', long_description=README,