diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-04 20:20:22 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-04 20:22:07 -0700 |
| commit | 4d8933abdf4a190493f2762d423f469f6d8b30a9 (patch) | |
| tree | e538d4b0c390b54e411e3d67f8fb09ff3ab28bd5 /sleekxmpp/plugins/xep_0202 | |
| parent | 6eac0606cf5cd0b7777eb86b77ed1b061dd4b658 (diff) | |
| download | slixmpp-4d8933abdf4a190493f2762d423f469f6d8b30a9.tar.gz slixmpp-4d8933abdf4a190493f2762d423f469f6d8b30a9.tar.bz2 slixmpp-4d8933abdf4a190493f2762d423f469f6d8b30a9.tar.xz slixmpp-4d8933abdf4a190493f2762d423f469f6d8b30a9.zip | |
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.
Diffstat (limited to 'sleekxmpp/plugins/xep_0202')
| -rw-r--r-- | sleekxmpp/plugins/xep_0202/__init__.py | 22 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0202/stanza.py | 7 |
2 files changed, 4 insertions, 25 deletions
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): |