From d7ba7cc72a65d005ba3702b4254609f6da6a80ca Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 8 Apr 2011 16:14:22 -0400
Subject: [PATCH 1/3] Use underscore method name.

Since camelcase names are aliased to the underscored name at startup,
if the underscored version is replaced later, the camelCase name does
not reflect the change.
---
 sleekxmpp/stanza/iq.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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'
 

From 87ccd804ff346f3c2aa06b2be9479b1f82817c12 Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 8 Apr 2011 16:39:39 -0400
Subject: [PATCH 2/3] Add version info.

May now use sleekxmpp.__version__ and sleekxmpp.__version_info__.
---
 sleekxmpp/__init__.py | 3 +++
 1 file changed, 3 insertions(+)

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)

From 2e1befc8c6e3092b773a8c297bc183823c2eaeed Mon Sep 17 00:00:00 2001
From: Lance Stout <lancestout@gmail.com>
Date: Fri, 8 Apr 2011 16:41:18 -0400
Subject: [PATCH 3/3] Make setup.py use sleekxmpp.__version__

---
 setup.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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).