From 2e8e542bc9391e49cb901217f77915f42cdd8c17 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sun, 3 Jul 2011 12:43:34 -0700 Subject: Added XEP-0203 Delayed Delivery plugin. --- sleekxmpp/plugins/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sleekxmpp/plugins/__init__.py') diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index d27937ae..5630c1d9 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -6,5 +6,6 @@ See the file LICENSE for copying permission. """ __all__ = ['xep_0004', 'xep_0009', 'xep_0012', 'xep_0030', 'xep_0033', - 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0085', 'xep_0086', - 'xep_0092', 'xep_0128', 'xep_0199', 'xep_0202', 'gmail_notify'] + 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0066', 'xep_0082', + 'xep_0085', 'xep_0086', 'xep_0092', 'xep_0128', 'xep_0199', + 'xep_0202', 'xep_0203', 'gmail_notify'] -- cgit v1.2.3 From 8d384ce44f62b14504df5ea22e54b92179c6d3c7 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sun, 3 Jul 2011 20:37:21 -0700 Subject: Added XEP-0224 Attention plugin. --- sleekxmpp/plugins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp/plugins/__init__.py') diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index 5630c1d9..b48a4c03 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -8,4 +8,4 @@ __all__ = ['xep_0004', 'xep_0009', 'xep_0012', 'xep_0030', 'xep_0033', 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0066', 'xep_0082', 'xep_0085', 'xep_0086', 'xep_0092', 'xep_0128', 'xep_0199', - 'xep_0202', 'xep_0203', 'gmail_notify'] + 'xep_0202', 'xep_0203', 'xep_0224', 'xep_0249', 'gmail_notify'] -- cgit v1.2.3 From a0767f6af61bc9c54b2526cd51aef7af4e383e90 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 4 Aug 2011 00:07:30 -0700 Subject: Sadly, dateutil is not actually part of the standard lib. Thus, using the XEP-0082 and XEP-0202 introduces a dependency on the dateutil package (installable using pip install python-dateutil). Maybe we'll be able to rework how these plugins work to avoid needing dateutil, but for now this will have to do. --- sleekxmpp/plugins/__init__.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'sleekxmpp/plugins/__init__.py') diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index b48a4c03..21a05fe0 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -6,6 +6,20 @@ See the file LICENSE for copying permission. """ __all__ = ['xep_0004', 'xep_0009', 'xep_0012', 'xep_0030', 'xep_0033', - 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0066', 'xep_0082', - 'xep_0085', 'xep_0086', 'xep_0092', 'xep_0128', 'xep_0199', - 'xep_0202', 'xep_0203', 'xep_0224', 'xep_0249', 'gmail_notify'] + 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0066', 'xep_0085', + 'xep_0086', 'xep_0092', 'xep_0128', 'xep_0199', 'xep_0203', + 'xep_0224', 'xep_0249', 'gmail_notify'] + +# Some plugins may require external dependencies beyond what the +# core SleekXMPP installation requires. Thus they should only by +# imported automatically if those dependecies are met. + +HAVE_DATEUTIL = True +try: + import dateutil +except: + HAVE_DATEUTIL = False + +if HAVE_DATEUTIL: + __all__.append('xep_0082') + __all__.append('xep_0202') -- cgit v1.2.3 From 4d8933abdf4a190493f2762d423f469f6d8b30a9 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 4 Aug 2011 20:20:22 -0700 Subject: Actually, we can work around needing dateutil. If dateutil is present, we'll use that. If not, we'll use some regexes from the fixed_datetime module. --- sleekxmpp/plugins/__init__.py | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'sleekxmpp/plugins/__init__.py') diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index 21a05fe0..3f90f059 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -6,20 +6,6 @@ See the file LICENSE for copying permission. """ __all__ = ['xep_0004', 'xep_0009', 'xep_0012', 'xep_0030', 'xep_0033', - 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0066', 'xep_0085', - 'xep_0086', 'xep_0092', 'xep_0128', 'xep_0199', 'xep_0203', - 'xep_0224', 'xep_0249', 'gmail_notify'] - -# Some plugins may require external dependencies beyond what the -# core SleekXMPP installation requires. Thus they should only by -# imported automatically if those dependecies are met. - -HAVE_DATEUTIL = True -try: - import dateutil -except: - HAVE_DATEUTIL = False - -if HAVE_DATEUTIL: - __all__.append('xep_0082') - __all__.append('xep_0202') + 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0066', 'xep_0082', + 'xep_0085', 'xep_0086', 'xep_0092', 'xep_0128', 'xep_0199', + 'xep_0082', 'xep_0203', 'xep_0224', 'xep_0249', 'gmail_notify'] -- cgit v1.2.3 From 6c8a135612e1bc9a8da9347cdf1ae6c3858799c3 Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Thu, 4 Aug 2011 21:49:15 -0700 Subject: Fix imports using __all__. --- sleekxmpp/plugins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sleekxmpp/plugins/__init__.py') diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index 3f90f059..7fa031ef 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -8,4 +8,4 @@ __all__ = ['xep_0004', 'xep_0009', 'xep_0012', 'xep_0030', 'xep_0033', 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0066', 'xep_0082', 'xep_0085', 'xep_0086', 'xep_0092', 'xep_0128', 'xep_0199', - 'xep_0082', 'xep_0203', 'xep_0224', 'xep_0249', 'gmail_notify'] + 'xep_0203', 'xep_0224', 'xep_0249', 'gmail_notify'] -- cgit v1.2.3 From 75f23d11301f09a29db4d0cc185dd5ffdc4a18fe Mon Sep 17 00:00:00 2001 From: Lance Stout Date: Sat, 6 Aug 2011 00:45:18 -0700 Subject: Fix XEP-0078 using the new stream feature workflow. Honestly, this is mainly just a demo/proof of concept that we can handle dependencies and ordering issues with stream features. DON'T use XEP-0078 if you are able to use the normal SASL method, which should be the case unless you are dealing with a very old XMPP server implementation. --- sleekxmpp/plugins/__init__.py | 2 ++ 1 file changed, 2 insertions(+) (limited to 'sleekxmpp/plugins/__init__.py') diff --git a/sleekxmpp/plugins/__init__.py b/sleekxmpp/plugins/__init__.py index 7fa031ef..c0b1121b 100644 --- a/sleekxmpp/plugins/__init__.py +++ b/sleekxmpp/plugins/__init__.py @@ -9,3 +9,5 @@ __all__ = ['xep_0004', 'xep_0009', 'xep_0012', 'xep_0030', 'xep_0033', 'xep_0045', 'xep_0050', 'xep_0060', 'xep_0066', 'xep_0082', 'xep_0085', 'xep_0086', 'xep_0092', 'xep_0128', 'xep_0199', 'xep_0203', 'xep_0224', 'xep_0249', 'gmail_notify'] + +# Don't automatically load xep_0078 -- cgit v1.2.3