diff options
| author | Lance Stout <lancestout@gmail.com> | 2011-04-08 16:41:45 -0400 |
|---|---|---|
| committer | Lance Stout <lancestout@gmail.com> | 2011-04-08 16:41:45 -0400 |
| commit | 6b0593857352c851ce2e55743802ab5fbdd81f5f (patch) | |
| tree | 6decf0c5a752eb498044fca2c034dd57418024f2 /sleekxmpp | |
| parent | 77601f7262370ba172966352a94575ec02b4a776 (diff) | |
| parent | 2e1befc8c6e3092b773a8c297bc183823c2eaeed (diff) | |
| download | slixmpp-6b0593857352c851ce2e55743802ab5fbdd81f5f.tar.gz slixmpp-6b0593857352c851ce2e55743802ab5fbdd81f5f.tar.bz2 slixmpp-6b0593857352c851ce2e55743802ab5fbdd81f5f.tar.xz slixmpp-6b0593857352c851ce2e55743802ab5fbdd81f5f.zip | |
Merge branch 'develop' into roster
Diffstat (limited to 'sleekxmpp')
| -rw-r--r-- | sleekxmpp/__init__.py | 3 | ||||
| -rw-r--r-- | sleekxmpp/stanza/iq.py | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/sleekxmpp/__init__.py b/sleekxmpp/__init__.py index 20f43671..5ad11742 100644 --- a/sleekxmpp/__init__.py +++ b/sleekxmpp/__init__.py @@ -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) 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' |