diff options
| author | Thom Nichols <tmnichols@gmail.com> | 2010-07-01 17:50:45 -0400 |
|---|---|---|
| committer | Thom Nichols <tmnichols@gmail.com> | 2010-07-01 17:50:45 -0400 |
| commit | 62da57a6c26a16024dd481b364e5d1021bc3dd3b (patch) | |
| tree | 9b0bb5e2907fb4a2e8cc48f844a9fb5431ad4c09 /sleekxmpp/stanza | |
| parent | ba9633f8f7ef86c73dd02ad316e7963447a6239b (diff) | |
| parent | f477ccf533a9b041e5f32b8b01e8381e05bcadf2 (diff) | |
| download | slixmpp-62da57a6c26a16024dd481b364e5d1021bc3dd3b.tar.gz slixmpp-62da57a6c26a16024dd481b364e5d1021bc3dd3b.tar.bz2 slixmpp-62da57a6c26a16024dd481b364e5d1021bc3dd3b.tar.xz slixmpp-62da57a6c26a16024dd481b364e5d1021bc3dd3b.zip | |
Merge branch 'master' of git://github.com/macdiesel/SleekXMPP into hacks
Diffstat (limited to 'sleekxmpp/stanza')
| -rw-r--r-- | sleekxmpp/stanza/error.py | 8 | ||||
| -rw-r--r-- | sleekxmpp/stanza/iq.py | 14 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sleekxmpp/stanza/error.py b/sleekxmpp/stanza/error.py index ee46722a..3346ceb2 100644 --- a/sleekxmpp/stanza/error.py +++ b/sleekxmpp/stanza/error.py @@ -1,9 +1,9 @@ """ - SleekXMPP: The Sleek XMPP Library - Copyright (C) 2010 Nathanael C. Fritz - This file is part of SleekXMPP. + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. - See the file license.txt for copying permission. + See the file license.txt for copying permission. """ from .. xmlstream.stanzabase import ElementBase, ET diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py index ded7515f..26f09268 100644 --- a/sleekxmpp/stanza/iq.py +++ b/sleekxmpp/stanza/iq.py @@ -1,9 +1,9 @@ """ - SleekXMPP: The Sleek XMPP Library - Copyright (C) 2010 Nathanael C. Fritz - This file is part of SleekXMPP. + SleekXMPP: The Sleek XMPP Library + Copyright (C) 2010 Nathanael C. Fritz + This file is part of SleekXMPP. - See the file license.txt for copying permission. + See the file license.txt for copying permission. """ from .. xmlstream.stanzabase import StanzaBase from xml.etree import cElementTree as ET @@ -67,11 +67,11 @@ class Iq(RootStanza): self.xml.remove(child) return self - def send(self, block=True, timeout=10): + def send(self, block=True, timeout=10, priority=False): if block and self['type'] in ('get', 'set'): waitfor = Waiter('IqWait_%s' % self['id'], MatcherId(self['id'])) self.stream.registerHandler(waitfor) - StanzaBase.send(self) + StanzaBase.send(self, priority) return waitfor.wait(timeout) else: - return StanzaBase.send(self) + return StanzaBase.send(self, priority) |