diff --git a/i3pystatus/core/settings.py b/i3pystatus/core/settings.py index e84fd3f..9a16aec 100644 --- a/i3pystatus/core/settings.py +++ b/i3pystatus/core/settings.py @@ -115,18 +115,18 @@ class SettingsBase(metaclass=SettingsBaseMeta): user_backend = settings_source.get('keyring_backend') found_settings = dict() for setting_name in self.__PROTECTED_SETTINGS: - # Nothing to do if the setting is already defined. - if settings_source.get(setting_name): - continue + # Nothing to do if the setting is already defined. + if settings_source.get(setting_name): + continue - setting = None - identifier = "%s.%s" % (self.__name__, setting_name) - if hasattr(self, 'required') and setting_name in getattr(self, 'required'): - setting = self.get_setting_from_keyring(identifier, user_backend) - elif hasattr(self, setting_name): - setting = self.get_setting_from_keyring(identifier, user_backend) - if setting: - found_settings.update({setting_name: setting}) + setting = None + identifier = "%s.%s" % (self.__name__, setting_name) + if hasattr(self, 'required') and setting_name in getattr(self, 'required'): + setting = self.get_setting_from_keyring(identifier, user_backend) + elif hasattr(self, setting_name): + setting = self.get_setting_from_keyring(identifier, user_backend) + if setting: + found_settings.update({setting_name: setting}) return found_settings def get_setting_from_keyring(self, setting_identifier, keyring_backend=None): diff --git a/i3pystatus/core/util.py b/i3pystatus/core/util.py index 268e3be..19775ba 100644 --- a/i3pystatus/core/util.py +++ b/i3pystatus/core/util.py @@ -564,9 +564,9 @@ def make_glyph(number, glyphs="▁▂▃▄▅▆▇█", lower_bound=0, upper_b if lower_bound >= upper_bound: raise Exception("Invalid upper/lower bounds") elif number <= lower_bound: - return glyphs[0] + return glyphs[0] elif number >= upper_bound: - return glyphs[-1] + return glyphs[-1] if enable_boundary_glyphs: # Trim first and last items from glyphs as boundary conditions already diff --git a/i3pystatus/timewarrior.py b/i3pystatus/timewarrior.py index 979cb17..a45de8a 100644 --- a/i3pystatus/timewarrior.py +++ b/i3pystatus/timewarrior.py @@ -49,9 +49,9 @@ class Timewarrior(IntervalModule): self.loadTrack() if 'end' in self.track and self.enable_continue: - subprocess.check_output(['timew', 'continue']) + subprocess.check_output(['timew', 'continue']) elif self.enable_stop: - subprocess.check_output(['timew', 'stop']) + subprocess.check_output(['timew', 'stop']) def run(self): self.loadTrack()