diff options
| author | mathieui <mathieui@mathieui.net> | 2017-02-13 19:50:02 +0100 |
|---|---|---|
| committer | mathieui <mathieui@mathieui.net> | 2017-02-13 19:50:02 +0100 |
| commit | 5ef524d3b13194e44e8674da05dc211aa2c31036 (patch) | |
| tree | 5419377ebd8ba6034b35071f8540948125fa0011 | |
| parent | 747529845ed9d344a3e0a9040c0942b2d5c1db5e (diff) | |
| download | poezio-5ef524d3b13194e44e8674da05dc211aa2c31036.tar.gz poezio-5ef524d3b13194e44e8674da05dc211aa2c31036.tar.bz2 poezio-5ef524d3b13194e44e8674da05dc211aa2c31036.tar.xz poezio-5ef524d3b13194e44e8674da05dc211aa2c31036.zip | |
Don't override "id" and "type" builtins
| -rw-r--r-- | plugins/reminder.py | 16 | ||||
| -rw-r--r-- | poezio/core/commands.py | 10 |
2 files changed, 13 insertions, 13 deletions
diff --git a/plugins/reminder.py b/plugins/reminder.py index f8a69f70..8fc5eb0a 100644 --- a/plugins/reminder.py +++ b/plugins/reminder.py @@ -115,14 +115,14 @@ class Plugin(BasePlugin): def command_done(self, arg="0"): try: - id = int(arg) + id_ = int(arg) except: return - if not id in self.tasks: + if not id_ in self.tasks: return - self.api.information('Task %s: %s [DONE]' % (id, self.tasks[id][1]), 'Info') - del self.tasks[id] + self.api.information('Task %s: %s [DONE]' % (id_, self.tasks[id_][1]), 'Info') + del self.tasks[id_] def command_tasks(self, arg, nocommand=None): if nocommand: @@ -135,13 +135,13 @@ class Plugin(BasePlugin): if s: self.api.information(s, 'Info') - def remind(self, id=0): - if not id in self.tasks: + def remind(self, id_=0): + if not id_ in self.tasks: return - self.api.information('Task %s: %s' % (id, self.tasks[id][1]), 'Info') + self.api.information('Task %s: %s' % (id_, self.tasks[id_][1]), 'Info') if self.config.get('beep', '') == 'true': curses.beep() - timed_event = timed_events.DelayedEvent(self.tasks[id][0], self.remind, id) + timed_event = timed_events.DelayedEvent(self.tasks[id_][0], self.remind, id_) self.api.add_timed_event(timed_event) def cleanup(self): diff --git a/poezio/core/commands.py b/poezio/core/commands.py index 838e08fa..8c960bad 100644 --- a/poezio/core/commands.py +++ b/poezio/core/commands.py @@ -148,13 +148,13 @@ class CommandCore: if args is None: return self.help('presence') - jid, type, status = args[0], args[1], args[2] + jid, ptype, status = args[0], args[1], args[2] if jid == '.' and isinstance(self.core.current_tab(), tabs.ChatTab): jid = self.core.current_tab().name - if type == 'available': - type = None + if ptype == 'available': + ptype = None try: - pres = self.core.xmpp.make_presence(pto=jid, ptype=type, pstatus=status) + pres = self.core.xmpp.make_presence(pto=jid, ptype=ptype, pstatus=status) self.core.events.trigger('send_normal_presence', pres) pres.send() except: @@ -163,7 +163,7 @@ class CommandCore: return tab = self.core.get_tab_by_name(jid) if tab: - if type in ('xa', 'away'): + if ptype in ('xa', 'away'): tab.directed_presence = False chatstate = 'inactive' else: |