summaryrefslogtreecommitdiff
path: root/sleekxmpp
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-05-09 12:19:35 -0700
committerLance Stout <lancestout@gmail.com>2013-05-09 12:19:35 -0700
commitd3284f1604920d2504c23bd7d0792739c6ec5a26 (patch)
tree480e2a7f4f73ad54395d60a174ad7f7ee5281a6d /sleekxmpp
parent60cfab995f6669b87554a70a908241658332ac8c (diff)
parent3279697128990e7036457bb9ab03c958e83f8168 (diff)
downloadslixmpp-d3284f1604920d2504c23bd7d0792739c6ec5a26.tar.gz
slixmpp-d3284f1604920d2504c23bd7d0792739c6ec5a26.tar.bz2
slixmpp-d3284f1604920d2504c23bd7d0792739c6ec5a26.tar.xz
slixmpp-d3284f1604920d2504c23bd7d0792739c6ec5a26.zip
Merge pull request #232 from kstaniek/develop
Fix in tzoffset and _get_fixed_offset_tz
Diffstat (limited to 'sleekxmpp')
-rw-r--r--sleekxmpp/thirdparty/mini_dateutil.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/thirdparty/mini_dateutil.py b/sleekxmpp/thirdparty/mini_dateutil.py
index 93f26312..e751a448 100644
--- a/sleekxmpp/thirdparty/mini_dateutil.py
+++ b/sleekxmpp/thirdparty/mini_dateutil.py
@@ -108,7 +108,7 @@ except:
def __init__(self, name, offset):
self._name = name
- self._offset = datetime.timedelta(seconds=offset)
+ self._offset = datetime.timedelta(minutes=offset)
def utcoffset(self, dt):
return self._offset
@@ -154,7 +154,7 @@ except:
absoff = offsetmins
name = "UTC%s%02d:%02d" % (sign, int(absoff / 60), absoff % 60)
- inst = tzoffset(offsetmins, name)
+ inst = tzoffset(name,offsetmins)
_fixed_offset_tzs[offsetmins] = inst
return _fixed_offset_tzs[offsetmins]