l.behm/bumblebee-status
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[core/module] Use __ for private variables

Browse source
This commit is contained in:
tobi-wan-kenobi 2020-04-04 13:55:54 +02:00
parent 476b2000f9
commit 3aeec1c7e6
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/module.py
View file

@ -32,10 +32,10 @@ class Module(core.input.Object):
def __init__(self, config=None, widgets=[]): def __init__(self, config=None, widgets=[]):
super().__init__() super().__init__()
self._config = config self._config = config
self._widgets = widgets if isinstance(widgets, list) else [ widgets ] self.__widgets = widgets if isinstance(widgets, list) else [ widgets ]
for widget in self._widgets: for widget in self.__widgets:
widget.module(self) widget.module(self)
self._name = None self.__name = None
self.next_update = None self.next_update = None
def parameter(self, key, default=None): def parameter(self, key, default=None):
@ -57,19 +57,19 @@ class Module(core.input.Object):
self.update() self.update()
except Exception as e: except Exception as e:
module = Error(config=self._config, module='error', error=str(e)) module = Error(config=self._config, module='error', error=str(e))
self._widgets = [module.widget()] self.__widgets = [module.widget()]
self.update = module.update self.update = module.update
def name(self): def name(self):
return self._name if self._name else self.module_name() return self.__name if self.__name else self.module_name()
def module_name(self): def module_name(self):
return self.__module__.split('.')[-1] return self.__module__.split('.')[-1]
def widgets(self, widgets=None): def widgets(self, widgets=None):
if widgets: if widgets:
self._widgets = widgets self.__widgets = widgets
return self._widgets return self.__widgets
def widget(self, name=None): def widget(self, name=None):
if not name: return self.widgets()[0] if not name: return self.widgets()[0]
@ -91,8 +91,8 @@ class Module(core.input.Object):
class Error(Module): class Error(Module):
def __init__(self, module, error, config=core.config.Config([])): def __init__(self, module, error, config=core.config.Config([])):
super().__init__(config, core.widget.Widget(self.full_text)) super().__init__(config, core.widget.Widget(self.full_text))
self._module = module self.__module = module
self._error = error self.__error = error
self.set('scrolling.bounce', False) self.set('scrolling.bounce', False)
self.set('scrolling.speed', 2) self.set('scrolling.speed', 2)
@ -100,7 +100,7 @@ class Error(Module):
@core.decorators.scrollable @core.decorators.scrollable
def full_text(self, widget): def full_text(self, widget):
return '{}: {}'.format(self._module, self._error) return '{}: {}'.format(self.__module, self.__error)
def state(self, widget): def state(self, widget):
return ['critical'] return ['critical']