summaryrefslogtreecommitdiff
path: root/sleekxmpp/xmlstream/xmlstream.py
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2013-02-25 09:53:35 -0800
committerLance Stout <lancestout@gmail.com>2013-02-25 09:53:35 -0800
commit82bbe5d1a67613d5e1a23bec4260b9e6644d339b (patch)
tree2d7a61c4f64afc7485e5a6ae71b0fe972ab8d1e4 /sleekxmpp/xmlstream/xmlstream.py
parent9a45ebd98bb03120f1eca3945eaa8777abe8ece0 (diff)
parenta1d71d31e85df2cf6efc835c30592126ca9861f2 (diff)
downloadslixmpp-82bbe5d1a67613d5e1a23bec4260b9e6644d339b.tar.gz
slixmpp-82bbe5d1a67613d5e1a23bec4260b9e6644d339b.tar.bz2
slixmpp-82bbe5d1a67613d5e1a23bec4260b9e6644d339b.tar.xz
slixmpp-82bbe5d1a67613d5e1a23bec4260b9e6644d339b.zip
Merge branch 'develop'
Diffstat (limited to 'sleekxmpp/xmlstream/xmlstream.py')
-rw-r--r--sleekxmpp/xmlstream/xmlstream.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/sleekxmpp/xmlstream/xmlstream.py b/sleekxmpp/xmlstream/xmlstream.py
index 3f87df52..289e3a21 100644
--- a/sleekxmpp/xmlstream/xmlstream.py
+++ b/sleekxmpp/xmlstream/xmlstream.py
@@ -1015,8 +1015,8 @@ class XMLStream(object):
# and handler classes here.
if name is None:
- name = 'add_handler_%s' % self.getNewId()
- self.registerHandler(XMLCallback(name, MatchXMLMask(mask), pointer,
+ name = 'add_handler_%s' % self.new_id()
+ self.register_handler(XMLCallback(name, MatchXMLMask(mask), pointer,
once=disposable, instream=instream))
def register_handler(self, handler, before=None, after=None):