summaryrefslogtreecommitdiff
path: root/poezio
diff options
context:
space:
mode:
authormathieui <mathieui@mathieui.net>2017-02-13 19:50:02 +0100
committermathieui <mathieui@mathieui.net>2017-02-13 19:50:02 +0100
commit5ef524d3b13194e44e8674da05dc211aa2c31036 (patch)
tree5419377ebd8ba6034b35071f8540948125fa0011 /poezio
parent747529845ed9d344a3e0a9040c0942b2d5c1db5e (diff)
downloadpoezio-5ef524d3b13194e44e8674da05dc211aa2c31036.tar.gz
poezio-5ef524d3b13194e44e8674da05dc211aa2c31036.tar.bz2
poezio-5ef524d3b13194e44e8674da05dc211aa2c31036.tar.xz
poezio-5ef524d3b13194e44e8674da05dc211aa2c31036.zip
Don't override "id" and "type" builtins
Diffstat (limited to 'poezio')
-rw-r--r--poezio/core/commands.py10
1 files changed, 5 insertions, 5 deletions
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: