Merge branch 'develop' into roster

This commit is contained in:
Lance Stout
2011-04-08 16:41:45 -04:00
3 changed files with 7 additions and 2 deletions

View File

@@ -14,3 +14,6 @@ from sleekxmpp.xmlstream.handler import *
from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream.matcher import *
from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET
__version__ = '1.0beta5'
__version_info__ = (1, 0, 0, 'beta5', 0)

View File

@@ -77,7 +77,7 @@ class Iq(RootStanza):
StanzaBase.__init__(self, *args, **kwargs)
if self['id'] == '':
if self.stream is not None:
self['id'] = self.stream.getNewId()
self['id'] = self.stream.new_id()
else:
self['id'] = '0'