From c1be52847bae48215a8e5589b3a3b94bc1bb913c Mon Sep 17 00:00:00 2001 From: Emmanuel Gil Peyrot Date: Thu, 31 Mar 2016 23:24:58 +0100 Subject: Fix core commands, broken in the previous commit. --- poezio/tabs/basetabs.py | 2 +- poezio/tabs/conversationtab.py | 4 ++-- poezio/tabs/muclisttab.py | 2 +- poezio/tabs/muctab.py | 26 +++++++++++++------------- poezio/tabs/privatetab.py | 2 +- poezio/tabs/rostertab.py | 22 +++++++++++----------- poezio/tabs/xmltab.py | 4 ++-- 7 files changed, 31 insertions(+), 31 deletions(-) (limited to 'poezio/tabs') diff --git a/poezio/tabs/basetabs.py b/poezio/tabs/basetabs.py index 5f0bc138..29da6fea 100644 --- a/poezio/tabs/basetabs.py +++ b/poezio/tabs/basetabs.py @@ -648,7 +648,7 @@ class ChatTab(Tab): /correct """ if not line: - self.core.command_help('correct') + self.core.command.help('correct') return if not self.last_sent_message: self.core.information('There is no message to correct.') diff --git a/poezio/tabs/conversationtab.py b/poezio/tabs/conversationtab.py index dd93bcd5..5451520f 100644 --- a/poezio/tabs/conversationtab.py +++ b/poezio/tabs/conversationtab.py @@ -155,7 +155,7 @@ class ConversationTab(OneToOneTab): /last_activity [jid] """ if args and args[0]: - return self.core.command_last_activity(args[0]) + return self.core.command.last_activity(args[0]) def callback(iq): if iq['type'] != 'result': @@ -223,7 +223,7 @@ class ConversationTab(OneToOneTab): res.get('os') or 'an unknown platform') self.core.information(version, 'Info') if args: - return self.core.command_version(args[0]) + return self.core.command.version(args[0]) jid = safeJID(self.name) if not jid.resource: if jid in roster: diff --git a/poezio/tabs/muclisttab.py b/poezio/tabs/muclisttab.py index 92d55190..0013fc9a 100644 --- a/poezio/tabs/muclisttab.py +++ b/poezio/tabs/muclisttab.py @@ -66,5 +66,5 @@ class MucListTab(ListTab): row = self.listview.get_selected_row() if not row: return - self.core.command_join(row[1]) + self.core.command.join(row[1]) diff --git a/poezio/tabs/muctab.py b/poezio/tabs/muctab.py index 1f3ec6d8..28161a6d 100644 --- a/poezio/tabs/muctab.py +++ b/poezio/tabs/muctab.py @@ -326,9 +326,9 @@ class MucTab(ChatTab): def command_invite(self, args): """/invite [reason]""" if args is None: - return self.core.command_help('invite') + return self.core.command.help('invite') jid, reason = args - self.core.command_invite('%s %s "%s"' % (jid, self.name, reason)) + self.core.command.invite('%s %s "%s"' % (jid, self.name, reason)) def completion_invite(self, the_input): """Completion for /invite""" @@ -352,7 +352,7 @@ class MucTab(ChatTab): /info """ if args is None: - return self.core.command_help('info') + return self.core.command.help('info') nick = args[0] user = self.get_user_by_name(nick) if not user: @@ -494,7 +494,7 @@ class MucTab(ChatTab): User "random" to attribute a random color. """ if args is None: - return self.core.command_help('color') + return self.core.command.help('color') nick = args[0] color = args[1].lower() user = self.get_user_by_name(nick) @@ -544,7 +544,7 @@ class MucTab(ChatTab): res.get('os') or 'an unknown platform') self.core.information(version, 'Info') if args is None: - return self.core.command_help('version') + return self.core.command.help('version') nick = args[0] if nick in [user.nick for user in self.users]: jid = safeJID(self.name).bare @@ -560,7 +560,7 @@ class MucTab(ChatTab): /nick """ if args is None: - return self.core.command_help('nick') + return self.core.command.help('nick') nick = args[0] if not self.joined: return self.core.information('/nick only works in joined rooms', @@ -632,7 +632,7 @@ class MucTab(ChatTab): /query [message] """ if args is None: - return self.core.command_help('query') + return self.core.command.help('query') nick = args[0] r = None for user in self.users: @@ -719,7 +719,7 @@ class MucTab(ChatTab): /kick [reason] """ if args is None: - return self.core.command_help('kick') + return self.core.command.help('kick') if len(args) == 2: msg = ' "%s"' % args[1] else: @@ -735,7 +735,7 @@ class MucTab(ChatTab): if iq['type'] == 'error': self.core.room_error(iq, self.name) if args is None: - return self.core.command_help('ban') + return self.core.command.help('ban') if len(args) > 1: msg = args[1] else: @@ -765,7 +765,7 @@ class MucTab(ChatTab): self.core.room_error(iq, self.name) if args is None: - return self.core.command_help('role') + return self.core.command.help('role') nick, role, reason = args[0], args[1].lower(), args[2] @@ -792,7 +792,7 @@ class MucTab(ChatTab): self.core.room_error(iq, self.name) if args is None: - return self.core.command_help('affiliation') + return self.core.command.help('affiliation') nick, affiliation = args[0], args[1].lower() @@ -867,7 +867,7 @@ class MucTab(ChatTab): /ignore """ if args is None: - return self.core.command_help('ignore') + return self.core.command.help('ignore') nick = args[0] user = self.get_user_by_name(nick) @@ -885,7 +885,7 @@ class MucTab(ChatTab): /unignore """ if args is None: - return self.core.command_help('unignore') + return self.core.command.help('unignore') nick = args[0] user = self.get_user_by_name(nick) diff --git a/poezio/tabs/privatetab.py b/poezio/tabs/privatetab.py index a715a922..e12f9fde 100644 --- a/poezio/tabs/privatetab.py +++ b/poezio/tabs/privatetab.py @@ -204,7 +204,7 @@ class PrivateTab(OneToOneTab): res.get('os') or 'an unknown platform') self.core.information(version, 'Info') if args: - return self.core.command_version(args[0]) + return self.core.command.version(args[0]) jid = safeJID(self.name) fixes.get_version(self.core.xmpp, jid, callback=callback) diff --git a/poezio/tabs/rostertab.py b/poezio/tabs/rostertab.py index f81d7ad0..f628d055 100644 --- a/poezio/tabs/rostertab.py +++ b/poezio/tabs/rostertab.py @@ -230,7 +230,7 @@ class RosterInfoTab(Tab): /cert_add [cert-management] """ if not args or len(args) < 2: - return self.core.command_help('cert_add') + return self.core.command.help('cert_add') def cb(iq): if iq['type'] == 'error': self.core.information('Unable to add the certificate.', 'Error') @@ -284,7 +284,7 @@ class RosterInfoTab(Tab): /cert_disable """ if not args: - return self.core.command_help('cert_disable') + return self.core.command.help('cert_disable') def cb(iq): if iq['type'] == 'error': self.core.information('Unable to disable the certificate.', 'Error') @@ -301,7 +301,7 @@ class RosterInfoTab(Tab): /cert_revoke """ if not args: - return self.core.command_help('cert_revoke') + return self.core.command.help('cert_revoke') def cb(iq): if iq['type'] == 'error': self.core.information('Unable to revoke the certificate.', 'Error') @@ -319,7 +319,7 @@ class RosterInfoTab(Tab): /cert_fetch """ if not args or len(args) < 2: - return self.core.command_help('cert_fetch') + return self.core.command.help('cert_fetch') def cb(iq): if iq['type'] == 'error': self.core.information('Unable to fetch the certificate.', @@ -485,7 +485,7 @@ class RosterInfoTab(Tab): else: self.core.information('No JID selected.', 'Error') return - self.core.command_last_activity(jid) + self.core.command.last_activity(jid) def resize(self): self.need_resize = False @@ -646,7 +646,7 @@ class RosterInfoTab(Tab): self.core.information('The name could not be set.', 'Error') log.debug('Error in /name:\n%s', iq) if args is None: - return self.core.command_help('name') + return self.core.command.help('name') jid = safeJID(args[0]).bare name = args[1] if len(args) == 2 else '' @@ -668,7 +668,7 @@ class RosterInfoTab(Tab): Add the specified JID to the specified group """ if args is None: - return self.core.command_help('groupadd') + return self.core.command.help('groupadd') jid = safeJID(args[0]).bare group = args[1] @@ -708,7 +708,7 @@ class RosterInfoTab(Tab): Remove the specified JID from the first specified group and add it to the second one """ if args is None: - return self.core.command_help('groupmove') + return self.core.command.help('groupmove') jid = safeJID(args[0]).bare group_from = args[1] group_to = args[2] @@ -763,7 +763,7 @@ class RosterInfoTab(Tab): Remove the specified JID from the specified group """ if args is None: - return self.core.command_help('groupremove') + return self.core.command.help('groupremove') jid = safeJID(args[0]).bare group = args[1] @@ -1125,9 +1125,9 @@ class RosterInfoTab(Tab): selected_row = self.roster_win.get_selected_row() if isinstance(selected_row, Contact): for resource in selected_row.resources: - self.core.command_version(str(resource.jid)) + self.core.command.version(str(resource.jid)) elif isinstance(selected_row, Resource): - self.core.command_version(str(selected_row.jid)) + self.core.command.version(str(selected_row.jid)) else: self.core.information('Nothing to get versions from', 'Info') diff --git a/poezio/tabs/xmltab.py b/poezio/tabs/xmltab.py index b063ad35..331c1558 100644 --- a/poezio/tabs/xmltab.py +++ b/poezio/tabs/xmltab.py @@ -203,7 +203,7 @@ class XMLTab(Tab): def command_filter_id(self, args): """/filter_id """ if args is None: - return self.core.command_help('filter_id') + return self.core.command.help('filter_id') self.update_filters(matcher.MatcherId(args[0])) self.refresh() @@ -234,7 +234,7 @@ class XMLTab(Tab): def command_dump(self, args): """/dump """ if args is None: - return self.core.command_help('dump') + return self.core.command.help('dump') if self.filters: xml = self.filtered_buffer.messages[:] else: -- cgit v1.2.3