Merge branch 'develop' into stream_features

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

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'