diff options
| author | Nathan Fritz <fritzy@netflint.net> | 2010-01-29 23:58:14 -0800 |
|---|---|---|
| committer | Nathan Fritz <fritzy@netflint.net> | 2010-01-29 23:58:14 -0800 |
| commit | 06fa1fcf332c9e0623dff90db8d1daacdfac87f1 (patch) | |
| tree | ff4466691117e0fee66add9d98f2edd378e55236 | |
| parent | 4d8709859096699ad79b8fce295ab05f2cb31de2 (diff) | |
| parent | 5e736f4b978414c111062ffb220e38eb40765db6 (diff) | |
| download | slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.gz slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.bz2 slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.xz slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.zip | |
Merge branch 'develop'
| -rw-r--r-- | setup.py | 19 | ||||
| -rw-r--r-- | sleekxmpp/plugins/xep_0060.py | 2 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/tostring/__init__.py (renamed from sleekxmpp/xmlstream/tostring.py) | 0 | ||||
| -rw-r--r-- | sleekxmpp/xmlstream/tostring26/__init__.py (renamed from sleekxmpp/xmlstream/tostring26.py) | 0 | ||||
| -rw-r--r-- | testall.py | 2 |
5 files changed, 15 insertions, 8 deletions
@@ -37,6 +37,18 @@ CLASSIFIERS = [ 'Intended Audience :: Developers', '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(
name = "sleekxmpp",
version = VERSION,
@@ -47,12 +59,7 @@ setup( url = 'http://code.google.com/p/sleekxmpp',
license = 'GPLv2',
platforms = [ 'any' ],
- packages = [ 'sleekxmpp',
- 'sleekxmpp/plugins',
- 'sleekxmpp/stanza',
- 'sleekxmpp/xmlstream',
- 'sleekxmpp/xmlstream/matcher',
- 'sleekxmpp/xmlstream/handler' ],
+ packages = packages,
requires = [ 'tlslite', 'pythondns' ],
)
diff --git a/sleekxmpp/plugins/xep_0060.py b/sleekxmpp/plugins/xep_0060.py index 837d0ad4..999b8197 100644 --- a/sleekxmpp/plugins/xep_0060.py +++ b/sleekxmpp/plugins/xep_0060.py @@ -63,7 +63,7 @@ class xep_0060(base.base_plugin): iq = self.xmpp.makeIqSet(pubsub) iq.attrib['to'] = jid iq.attrib['from'] = self.xmpp.fulljid - id = iq.get('id') + id = iq['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 return True diff --git a/sleekxmpp/xmlstream/tostring.py b/sleekxmpp/xmlstream/tostring/__init__.py index 6603cbb8..6603cbb8 100644 --- a/sleekxmpp/xmlstream/tostring.py +++ b/sleekxmpp/xmlstream/tostring/__init__.py diff --git a/sleekxmpp/xmlstream/tostring26.py b/sleekxmpp/xmlstream/tostring26/__init__.py index 9711c300..9711c300 100644 --- a/sleekxmpp/xmlstream/tostring26.py +++ b/sleekxmpp/xmlstream/tostring26/__init__.py @@ -13,7 +13,7 @@ class testoverall(unittest.TestCase): if sys.version_info < (3,0): self.failUnless(compileall.compile_dir('.' + os.sep + 'sleekxmpp', rx=re.compile('/[.]svn'), quiet=True)) 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): """Invoking the tabnanny""" |