diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:26:21 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-05-20 13:26:21 -0400 |
| commit | e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76 (patch) | |
| tree | f1eba0699b6a3a2752cb04a6299ab5e8e5006574 /sleekxmpp/stanza | |
| parent | f125c11a810cf308473394262879f94166c3f564 (diff) | |
| parent | 9f1648328f17b608651989606b9cf2636cdcfbec (diff) | |
| download | slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.gz slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.bz2 slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.tar.xz slixmpp-e2de82ac8d45d2a6709154ef27dbeb3d08ce1a76.zip | |
Merge branch 'develop' into stream_features
Conflicts:
sleekxmpp/clientxmpp.py
Diffstat (limited to 'sleekxmpp/stanza')
| -rw-r--r-- | sleekxmpp/stanza/iq.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sleekxmpp/stanza/iq.py b/sleekxmpp/stanza/iq.py index 2bfbc7b1..82ab13ec 100644 --- a/sleekxmpp/stanza/iq.py +++ b/sleekxmpp/stanza/iq.py @@ -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' |