From 06423964ec2445689c6a4559ff4ed02d16ec99c1 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 20 Jul 2012 22:03:17 -0700 Subject: Fix description of XEP-0222 plugin. --- sleekxmpp/plugins/xep_0222.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp') diff --git a/sleekxmpp/plugins/xep_0222.py b/sleekxmpp/plugins/xep_0222.py index 724ef968..1073c1a1 100644 --- a/sleekxmpp/plugins/xep_0222.py +++ b/sleekxmpp/plugins/xep_0222.py @@ -22,7 +22,7 @@ class XEP_0222(BasePlugin): """ name = 'xep_0222' - description = 'XEP-0222: Persistent Storage of Private Data via PubSub' + description = 'XEP-0222: Persistent Storage of Public Data via PubSub' dependencies = set(['xep_0163', 'xep_0060', 'xep_0004']) profile = {'pubsub#persist_items': True, -- cgit v1.2.3 From 6680c244f501643010c1be64b4cd06da26c80c7c Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Fri, 20 Jul 2012 22:04:36 -0700 Subject: Fix deprecation warning for setting self.resource --- sleekxmpp/basexmpp.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp') diff --git a/sleekxmpp/basexmpp.py b/sleekxmpp/basexmpp.py index 90134c4d..9e5b9bbf 100644 --- a/sleekxmpp/basexmpp.py +++ b/sleekxmpp/basexmpp.py @@ -598,7 +598,7 @@ class BaseXMPP(XMLStream): @resource.setter def resource(self, value): - log.warning("fulljid property deprecated. Use boundjid.full") + log.warning("fulljid property deprecated. Use boundjid.resource") self.boundjid.resource = value @property -- cgit v1.2.3 From 459e1ed34587932de6cedafc305454d94df388a7 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sun, 22 Jul 2012 12:15:46 -0700 Subject: Handle Windows newlines in XEP-0027. Closes issue #184 --- sleekxmpp/plugins/xep_0027/gpg.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp') diff --git a/sleekxmpp/plugins/xep_0027/gpg.py b/sleekxmpp/plugins/xep_0027/gpg.py index 9c6ca078..3ca9c36d 100644 --- a/sleekxmpp/plugins/xep_0027/gpg.py +++ b/sleekxmpp/plugins/xep_0027/gpg.py @@ -24,7 +24,7 @@ def _extract_data(data, kind): if not begin_headers and 'BEGIN PGP %s' % kind in line: begin_headers = True continue - if begin_headers and line == '': + if begin_headers and line.stripped() == '': begin_data = True continue if 'END PGP %s' % kind in line: -- cgit v1.2.3 From fb221a8dc046b34cf28b853ba58d57711b624027 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sun, 22 Jul 2012 13:40:22 -0700 Subject: Add XEP-0133 support, which just makes the appropriate XEP-0050 calls. --- sleekxmpp/plugins/__init__.py | 1 + sleekxmpp/plugins/xep_0133.py | 54 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 55 insertions(+) create mode 100644 sleekxmpp/plugins/xep_0133.py (limited to 'sleekxmpp') diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index bd626176..77be8870 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -41,6 +41,7 @@ __all__ = [ 'xep_0115', # Entity Capabilities 'xep_0118', # User Tune 'xep_0128', # Extended Service Discovery + 'xep_0133', # Service Administration 'xep_0153', # vCard-Based Avatars 'xep_0163', # Personal Eventing Protocol 'xep_0172', # User Nickname diff --git a/sleekxmpp/plugins/xep_0133.py b/sleekxmpp/plugins/xep_0133.py new file mode 100644 index 00000000..7bbe4c3c --- /dev/null +++ b/sleekxmpp/plugins/xep_0133.py @@ -0,0 +1,54 @@ +""" + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2012 Nathanael C. Fritz, Lance J.T. Stout + This file is part of SleekXMPP. + + See the file LICENSE for copying permission. +""" + + +from sleekxmpp.plugins import BasePlugin, register_plugin + + +class XEP_0133(BasePlugin): + + name = 'xep_0133' + description = 'XEP-0133: Service Administration' + dependencies = set(['xep_0030', 'xep_0004', 'xep_0050']) + commands = set(['add-user', 'delete-user', 'disable-user', + 'reenable-user', 'end-user-session', 'get-user-password', + 'change-user-password', 'get-user-roster', + 'get-user-lastlogin', 'user-stats', 'edit-blacklist', + 'edit-whitelist', 'get-registered-users-num', + 'get-disabled-users-num', 'get-online-users-num', + 'get-active-users-num', 'get-idle-users-num', + 'get-registered-users-list', 'get-disabled-users-list', + 'get-online-users-list', 'get-online-users', + 'get-active-users', 'get-idle-userslist', 'announce', + 'set-motd', 'edit-motd', 'delete-motd', 'set-welcome', + 'delete-welcome', 'edit-admin', 'restart', 'shutdown']) + + def get_commands(self, jid=None, **kwargs): + if jid is None: + jid = self.xmpp.boundjid.server + return self.xmpp['xep_0050'].get_commands(jid, **kwargs) + + +def create_command(name): + def admin_command(self, jid=None, session=None, ifrom=None, block=False): + if jid is None: + jid = self.xmpp.boundjid.server + self.xmpp['xep_0050'].start_command( + jid=jid, + node='http://jabber.org/protocol/admin#%s' % name, + session=session, + ifrom=ifrom, + block=block) + return admin_command + + +for cmd in XEP_0133.commands: + setattr(XEP_0133, cmd.replace('-', '_'), create_command(cmd)) + + +register_plugin(XEP_0133) -- cgit v1.2.3