diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-08-04 22:34:34 -0700 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-08-04 22:36:23 -0700 |
| commit | 93a4a3f8a0f64eed846895365fa3da059bbf5ea1 (patch) | |
| tree | 31d8ce46d3349810d135270c65ee068d2003414d /sleekxmpp/thirdparty | |
| parent | 940e3eba35deab4c0d965dbbac4a57a534bd3681 (diff) | |
| download | slixmpp-93a4a3f8a0f64eed846895365fa3da059bbf5ea1.tar.gz slixmpp-93a4a3f8a0f64eed846895365fa3da059bbf5ea1.tar.bz2 slixmpp-93a4a3f8a0f64eed846895365fa3da059bbf5ea1.tar.xz slixmpp-93a4a3f8a0f64eed846895365fa3da059bbf5ea1.zip | |
Fix Python3 issue with dict.has_key()
Diffstat (limited to 'sleekxmpp/thirdparty')
| -rw-r--r-- | sleekxmpp/thirdparty/mini_dateutil.py | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/sleekxmpp/thirdparty/mini_dateutil.py b/sleekxmpp/thirdparty/mini_dateutil.py index 5b3af9a7..6af5ffde 100644 --- a/sleekxmpp/thirdparty/mini_dateutil.py +++ b/sleekxmpp/thirdparty/mini_dateutil.py @@ -144,17 +144,17 @@ except: if offsetmins == 0: return UTC - if not _fixed_offset_tzs.has_key(offsetmins): - if offsetmins < 0: - sign = '-' - absoff = -offsetmins - else: - sign = '+' - absoff = offsetmins - - name = "UTC%s%02d:%02d" % (sign, int(absoff / 60), absoff % 60) - inst = tzoffset(offsetmins, name) - _fixed_offset_tzs[offsetmins] = inst + if not offsetmins in _fixed_offset_tzs: + if offsetmins < 0: + sign = '-' + absoff = -offsetmins + else: + sign = '+' + absoff = offsetmins + + name = "UTC%s%02d:%02d" % (sign, int(absoff / 60), absoff % 60) + inst = tzoffset(offsetmins, name) + _fixed_offset_tzs[offsetmins] = inst return _fixed_offset_tzs[offsetmins] @@ -240,13 +240,13 @@ except: if frac != None: # ok, fractions of hour? if min == None: - frac, min = _math.modf(frac * 60.0) - min = int(min) + frac, min = _math.modf(frac * 60.0) + min = int(min) # fractions of second? if s == None: - frac, s = _math.modf(frac * 60.0) - s = int(s) + frac, s = _math.modf(frac * 60.0) + s = int(s) # and extract microseconds... us = int(frac * 1000000) |