summaryrefslogtreecommitdiff
path: root/sleekxmpp/plugins
diff options
context:
space:
mode:
Diffstat (limited to 'sleekxmpp/plugins')
-rw-r--r--sleekxmpp/plugins/__init__.py20
-rw-r--r--sleekxmpp/plugins/xep_0082.py13
-rw-r--r--sleekxmpp/plugins/xep_0202/__init__.py22
-rw-r--r--sleekxmpp/plugins/xep_0202/stanza.py7
4 files changed, 11 insertions, 51 deletions
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']
diff --git a/sleekxmpp/plugins/xep_0082.py b/sleekxmpp/plugins/xep_0082.py
index e78a50ad..d3c4cc56 100644
--- a/sleekxmpp/plugins/xep_0082.py
+++ b/sleekxmpp/plugins/xep_0082.py
@@ -10,13 +10,7 @@ import logging
import datetime as dt
from sleekxmpp.plugins.base import base_plugin
-
-try:
- from dateutil import parser
- from dateutil.tz import tzoffset, tzutc
-except e:
- log = logging.getLogger(__name__)
- log.warning("XEP-0082 plugin requires dateutil")
+from sleekxmpp.thirdparty import tzutc, tzoffset, parse_iso
# =====================================================================
@@ -31,7 +25,8 @@ def parse(time_str):
Arguments:
time_str -- A formatted timestamp string.
"""
- return parser.parse(time_str)
+ return parse_iso(time_str)
+
def format_date(time_obj):
"""
@@ -52,7 +47,7 @@ def format_time(time_obj):
Return a formatted string version of a time object.
format:
- hh:mm:ss[.sss][TZD
+ hh:mm:ss[.sss][TZD]
arguments:
time_obj -- A time or datetime object.
diff --git a/sleekxmpp/plugins/xep_0202/__init__.py b/sleekxmpp/plugins/xep_0202/__init__.py
index 3fb4744d..a34b2376 100644
--- a/sleekxmpp/plugins/xep_0202/__init__.py
+++ b/sleekxmpp/plugins/xep_0202/__init__.py
@@ -6,23 +6,7 @@
See the file LICENSE for copying permission.
"""
-import logging
-import sleekxmpp
-
-log = logging.getLogger(__name__)
-
-
-HAVE_DATEUTIL = True
-try:
- import dateutil
-except:
- HAVE_DATEUTIL = False
-
-
-if HAVE_DATEUTIL:
- from sleekxmpp.plugins.xep_0202 import stanza
- from sleekxmpp.plugins.xep_0202.stanza import EntityTime
- from sleekxmpp.plugins.xep_0202.time import xep_0202
-else:
- log.warning("XEP-0202 requires the dateutil package")
+from sleekxmpp.plugins.xep_0202 import stanza
+from sleekxmpp.plugins.xep_0202.stanza import EntityTime
+from sleekxmpp.plugins.xep_0202.time import xep_0202
diff --git a/sleekxmpp/plugins/xep_0202/stanza.py b/sleekxmpp/plugins/xep_0202/stanza.py
index 72ab403d..b6ccc960 100644
--- a/sleekxmpp/plugins/xep_0202/stanza.py
+++ b/sleekxmpp/plugins/xep_0202/stanza.py
@@ -11,12 +11,7 @@ import datetime as dt
from sleekxmpp.xmlstream import ElementBase
from sleekxmpp.plugins import xep_0082
-
-try:
- from dateutil.tz import tzutc
-except:
- log = logging.getLogger(__name__)
- log.warning("XEP-0202 plugin requies dateutil package")
+from sleekxmpp.thirdparty import tzutc, tzoffset
class EntityTime(ElementBase):