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/xmlstream/xmlstream.py | |
| 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/xmlstream/xmlstream.py')
| -rw-r--r-- | sleekxmpp/xmlstream/xmlstream.py | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py index 41c53a3e..5ba4269f 100644 --- a/sleekxmpp/xmlstream/xmlstream.py +++ b/sleekxmpp/xmlstream/xmlstream.py @@ -854,13 +854,14 @@ class XMLStream(object): Event handlers and the send queue will be threaded regardless of these parameters. """ - if kwargs.has_key('threaded') and kwargs.has_key('block'): - raise ValueError("process() called with both block and threaded arguments") - elif kwargs.has_key('block'): + if 'threaded' in kwargs and 'block' in kwargs: + raise ValueError("process() called with both " + \ + "block and threaded arguments") + elif 'block' in kwargs: threaded = not(kwargs.get('block', False)) else: threaded = kwargs.get('threaded', True) - + self.scheduler.process(threaded=True) def start_thread(name, target): |