github/SleekXMPP
1
0
Fork 0
mirror of https://github.com/correl/SleekXMPP.git synced 2024-11-24 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop' into roster

Browse source
This commit is contained in:
Lance Stout 2011-04-08 16:41:45 -04:00
commit 6b05938573
3 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
setup.py
View file

@ -12,6 +12,8 @@
from distutils.core import setup from distutils.core import setup
import sys import sys
import sleekxmpp
# if 'cygwin' in sys.platform.lower(): # if 'cygwin' in sys.platform.lower():
# min_version = '0.6c6' # min_version = '0.6c6'
# else: # else:
@ -25,7 +27,7 @@ import sys
# #
# from setuptools import setup, find_packages, Extension, Feature # 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).' DESCRIPTION = 'SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).'
LONG_DESCRIPTION = """ LONG_DESCRIPTION = """
SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc). SleekXMPP is an elegant Python library for XMPP (aka Jabber, Google Talk, etc).

3
sleekxmpp/__init__.py
View file

@ -14,3 +14,6 @@ from sleekxmpp.xmlstream.handler import *
from sleekxmpp.xmlstream import XMLStream, RestartStream from sleekxmpp.xmlstream import XMLStream, RestartStream
from sleekxmpp.xmlstream.matcher import * from sleekxmpp.xmlstream.matcher import *
from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET from sleekxmpp.xmlstream.stanzabase import StanzaBase, ET
__version__ = '1.0beta5'
__version_info__ = (1, 0, 0, 'beta5', 0)

2
sleekxmpp/stanza/iq.py
View file

@ -77,7 +77,7 @@ class Iq(RootStanza):
StanzaBase.__init__(self, *args, **kwargs) StanzaBase.__init__(self, *args, **kwargs)
if self['id'] == '': if self['id'] == '':
if self.stream is not None: if self.stream is not None:
self['id'] = self.stream.getNewId() self['id'] = self.stream.new_id()
else: else:
self['id'] = '0' self['id'] = '0'