summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLance Stout <lancestout@gmail.com>2011-04-08 16:42:02 -0400
committerLance Stout <lancestout@gmail.com>2011-04-08 16:42:02 -0400
commitae5ce170355de59cfd7913f85f7444f2f92bf21a (patch)
treed6308ab53b27d636956086afe44ef8213c99de91
parentf125c11a810cf308473394262879f94166c3f564 (diff)
parent2e1befc8c6e3092b773a8c297bc183823c2eaeed (diff)
downloadslixmpp-ae5ce170355de59cfd7913f85f7444f2f92bf21a.tar.gz
slixmpp-ae5ce170355de59cfd7913f85f7444f2f92bf21a.tar.bz2
slixmpp-ae5ce170355de59cfd7913f85f7444f2f92bf21a.tar.xz
slixmpp-ae5ce170355de59cfd7913f85f7444f2f92bf21a.zip
Merge branch 'develop' into stream_features
-rw-r--r--setup.py4
-rw-r--r--sleekxmpp/__init__.py3
-rw-r--r--sleekxmpp/stanza/iq.py2
3 files changed, 7 insertions, 2 deletions
diff --git a/setup.py b/setup.py
index 1443e90f..19047925 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,8 @@
from distutils.core import setup
import sys
+import sleekxmpp
+
# if 'cygwin' in sys.platform.lower():
# min_version = '0.6c6'
# else:
@@ -25,7 +27,7 @@ import sys
#
# from setuptools import setup, find_packages, Extension, Feature
-VERSION = '1.0.0.0'
+VERSION = sleekxmpp.__version__
DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).'
LONG_DESCRIPTION = """
SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).
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'