From 5e736f4b978414c111062ffb220e38eb40765db6 Mon Sep 17 00:00:00 2001
From: Nathan Fritz <fritzy@netflint.net>
Date: Fri, 29 Jan 2010 23:57:57 -0800
Subject: fixed setup.py issue with unicode in 3.x

---
 setup.py | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

(limited to 'setup.py')

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' ],
     )
 
-- 
cgit v1.2.3