github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-27 11:09:56 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix Python3 issue with dict.has_key()

Browse source
This commit is contained in:
Lance Stout 2011-08-04 22:34:34 -07:00
parent 940e3eba35
commit 93a4a3f8a0
3 changed files with 20 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sleekxmpp/plugins/xep_0009/remote.py
View file

@ -463,7 +463,7 @@ class RemoteSession(object):
key = "%s.%s" % (endpoint, name) key = "%s.%s" % (endpoint, name)
log.debug("Registering call handler for %s (%s)." % (key, method)) log.debug("Registering call handler for %s (%s)." % (key, method))
with self._lock: with self._lock:
if self._entries.has_key(key): if key in self._entries:
raise KeyError("A handler for %s has already been regisered!" % endpoint) raise KeyError("A handler for %s has already been regisered!" % endpoint)
self._entries[key] = JabberRPCEntry(endpoint, method) self._entries[key] = JabberRPCEntry(endpoint, method)
return key return key

28
sleekxmpp/thirdparty/mini_dateutil.py vendored
View file

@ -144,17 +144,17 @@ except:
if offsetmins == 0: if offsetmins == 0:
return UTC return UTC
if not _fixed_offset_tzs.has_key(offsetmins): if not offsetmins in _fixed_offset_tzs:
if offsetmins < 0: if offsetmins < 0:
sign = '-' sign = '-'
absoff = -offsetmins absoff = -offsetmins
else: else:
sign = '+' sign = '+'
absoff = offsetmins absoff = offsetmins
name = "UTC%s%02d:%02d" % (sign, int(absoff / 60), absoff % 60) name = "UTC%s%02d:%02d" % (sign, int(absoff / 60), absoff % 60)
inst = tzoffset(offsetmins, name) inst = tzoffset(offsetmins, name)
_fixed_offset_tzs[offsetmins] = inst _fixed_offset_tzs[offsetmins] = inst
return _fixed_offset_tzs[offsetmins] return _fixed_offset_tzs[offsetmins]
@ -240,13 +240,13 @@ except:
if frac != None: if frac != None:
# ok, fractions of hour? # ok, fractions of hour?
if min == None: if min == None:
frac, min = _math.modf(frac * 60.0) frac, min = _math.modf(frac * 60.0)
min = int(min) min = int(min)
# fractions of second? # fractions of second?
if s == None: if s == None:
frac, s = _math.modf(frac * 60.0) frac, s = _math.modf(frac * 60.0)
s = int(s) s = int(s)
# and extract microseconds... # and extract microseconds...
us = int(frac * 1000000) us = int(frac * 1000000)

9
sleekxmpp/xmlstream/xmlstream.py
View file

@ -854,13 +854,14 @@ class XMLStream(object):
Event handlers and the send queue will be threaded Event handlers and the send queue will be threaded
regardless of these parameters. regardless of these parameters.
""" """
if kwargs.has_key('threaded') and kwargs.has_key('block'): if 'threaded' in kwargs and 'block' in kwargs:
raise ValueError("process() called with both block and threaded arguments") raise ValueError("process() called with both " + \
elif kwargs.has_key('block'): "block and threaded arguments")
elif 'block' in kwargs:
threaded = not(kwargs.get('block', False)) threaded = not(kwargs.get('block', False))
else: else:
threaded = kwargs.get('threaded', True) threaded = kwargs.get('threaded', True)
self.scheduler.process(threaded=True) self.scheduler.process(threaded=True)
def start_thread(name, target): def start_thread(name, target):