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'

Browse source
This commit is contained in:
Nathan Fritz 2010-01-29 23:58:14 -08:00
commit 06fa1fcf33
5 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
setup.py
View file

@ -37,6 +37,18 @@ CLASSIFIERS = [ 'Intended Audience :: Developers',
'Topic :: Software Development :: Libraries :: Python Modules', 'Topic :: Software Development :: Libraries :: Python Modules',
] ]
packages = [ 'sleekxmpp',
'sleekxmpp/plugins',
'sleekxmpp/stanza',
'sleekxmpp/xmlstream',
'sleekxmpp/xmlstream/matcher',
'sleekxmpp/xmlstream/handler' ]
if sys.version_info < (3, 0):
packages.append('sleekxmpp/xmlstream/tostring26')
else:
packages.append('sleekxmpp/xmlstream/tostring')
setup( setup(
name = "sleekxmpp", name = "sleekxmpp",
version = VERSION, version = VERSION,
@ -47,12 +59,7 @@ setup(
url = 'http://code.google.com/p/sleekxmpp', url = 'http://code.google.com/p/sleekxmpp',
license = 'GPLv2', license = 'GPLv2',
platforms = [ 'any' ], platforms = [ 'any' ],
packages = [ 'sleekxmpp', packages = packages,
'sleekxmpp/plugins',
'sleekxmpp/stanza',
'sleekxmpp/xmlstream',
'sleekxmpp/xmlstream/matcher',
'sleekxmpp/xmlstream/handler' ],
requires = [ 'tlslite', 'pythondns' ], requires = [ 'tlslite', 'pythondns' ],
) )

2
sleekxmpp/plugins/xep_0060.py
View file

@ -63,7 +63,7 @@ class xep_0060(base.base_plugin):
iq = self.xmpp.makeIqSet(pubsub) iq = self.xmpp.makeIqSet(pubsub)
iq.attrib['to'] = jid iq.attrib['to'] = jid
iq.attrib['from'] = self.xmpp.fulljid iq.attrib['from'] = self.xmpp.fulljid
id = iq.get('id') id = iq['id']
result = self.xmpp.send(iq, "<iq id='%s'/>" % id) result = self.xmpp.send(iq, "<iq id='%s'/>" % id)
if result is False or result is None or result.get('type') == 'error': return False if result is False or result is None or result.get('type') == 'error': return False
return True return True

0
sleekxmpp/xmlstream/tostring.py → sleekxmpp/xmlstream/tostring/__init__.py
View file

0
sleekxmpp/xmlstream/tostring26.py → sleekxmpp/xmlstream/tostring26/__init__.py
View file

2
testall.py
View file

@ -13,7 +13,7 @@ class testoverall(unittest.TestCase):
if sys.version_info < (3,0): if sys.version_info < (3,0):
self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn'), quiet=True)) self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn'), quiet=True))
else: else:
self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn|26.py'), quiet=True)) self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn|.*26\Z'), quiet=True))
def testTabNanny(self): def testTabNanny(self):
"""Invoking the tabnanny""" """Invoking the tabnanny"""