summaryrefslogtreecommitdiff
path: root/setup.py
diff options
context:
space:
mode:
authorNathan Fritz <fritzy@netflint.net>2010-01-29 23:58:14 -0800
committerNathan Fritz <fritzy@netflint.net>2010-01-29 23:58:14 -0800
commit06fa1fcf332c9e0623dff90db8d1daacdfac87f1 (patch)
treeff4466691117e0fee66add9d98f2edd378e55236 /setup.py
parent4d8709859096699ad79b8fce295ab05f2cb31de2 (diff)
parent5e736f4b978414c111062ffb220e38eb40765db6 (diff)
downloadslixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.gz
slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.bz2
slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.tar.xz
slixmpp-06fa1fcf332c9e0623dff90db8d1daacdfac87f1.zip
Merge branch 'develop'
Diffstat (limited to 'setup.py')
-rw-r--r--setup.py19
1 files changed, 13 insertions, 6 deletions
diff --git a/setup.py b/setup.py
index 7dbd619b..163cb8c6 100644
--- a/setup.py
+++ b/setup.py
@@ -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' ],
)