diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-12 16:47:58 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-12 16:47:58 -0700 |
| commit | 484efff156e344fc3ca1a7377539132b702c0c78 (patch) | |
| tree | fa051515b9dc15eb3a5ab1a8e8b9c2e25b920d17 /sleekxmpp/plugins/xep_0082.py | |
| parent | 89cffd43f48cfc835b70e137776eb8c2e73a0b67 (diff) | |
| parent | 8f1d0e7a79b662e5f2849cea6e73716cc887e226 (diff) | |
| download | slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.gz slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.bz2 slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.tar.xz slixmpp-484efff156e344fc3ca1a7377539132b702c0c78.zip | |
Merge branch 'develop' into roster
Conflicts:
setup.py
sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/plugins/xep_0082.py')
| -rw-r--r-- | sleekxmpp/plugins/xep_0082.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sleekxmpp/plugins/xep_0082.py b/sleekxmpp/plugins/xep_0082.py index 785ba36b..d3c4cc56 100644 --- a/sleekxmpp/plugins/xep_0082.py +++ b/sleekxmpp/plugins/xep_0082.py @@ -6,10 +6,11 @@ See the file LICENSE for copying permission. """ +import logging import datetime as dt -from dateutil import parser -from dateutil.tz import tzoffset, tzutc + from sleekxmpp.plugins.base import base_plugin +from sleekxmpp.thirdparty import tzutc, tzoffset, parse_iso # ===================================================================== @@ -24,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): """ @@ -45,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. |