using what setuptools provide to manage Python version differences

Lawouach · Lawouach · commit 57bc35f8cd13 · 2014-03-29T16:10:44.000+01:00
diff --git a/setup.py b/setup.py
@@ -2,49 +2,20 @@
 import os, os.path
 from glob import iglob
 import sys
-try:
-    from setuptools import setup
-except ImportError:
-    from distutils.core import setup
+from setuptools import setup
 
-def gather_modules():
-    """
-    Lists all Python modules of the ws4py package.
-    I wish there was a simpler way but because some
-    modules use the 'yield from' statement, we
-    can't simply pass a list of directories to setup
-    below. Indeed, that would fail to compile
-    those modules when running Python 2. At the same
-    time, the MANIFEST doesn't work for bdist commands,
-    only source distributions. Distutils is beyond
-    annoying at cryptic at times. If you have a cleaner
-    way, please do submit a patch as I'd love seeing it.
-    """
-    pjoin = os.path.join
-
-    mods = []
-    for root, dirs, files in os.walk('ws4py'):
-        if '__pycache__' in dirs:
-            dirs.remove('__pycache__')
+extra = {}
+if sys.version_info >= (3,):
+    extra['use_2to3'] = True
         
-        for name in files:
-            if name.endswith('.py'):
-                mods.append(pjoin(root, name).replace('.py', ''))
-
-    if sys.version_info < (3, 3) or hasattr(sys, 'pypy_version_info'):
-        mods.remove(pjoin('ws4py', 'async_websocket.py').replace('.py', ''))
-        mods.remove(pjoin('ws4py', 'server', 'tulipserver.py').replace('.py', ''))
-
-    return mods
-
 setup(name = "ws4py",
       version = '0.3.3',
       description = "WebSocket client and server library for Python 2 and 3 as well as PyPy",
       maintainer = "Sylvain Hellegouarch",
       maintainer_email = "sh@defuze.org",
       url = "https://github.com/Lawouach/WebSocket-for-Python",
       download_url = "http://www.defuze.org/oss/ws4py/",
-      py_modules=gather_modules(),
+      py_modules=['ws4py', 'ws4py.client', 'ws4py.server'],
       platforms = ["any"],
       license = 'BSD',
       long_description = "WebSocket client and server library for Python 2 and 3 as well as PyPy",
@@ -66,5 +37,6 @@ def gather_modules():
           'Topic :: Internet :: WWW/HTTP :: WSGI :: Middleware',
           'Topic :: Internet :: WWW/HTTP :: WSGI :: Server',
           'Topic :: Software Development :: Libraries :: Python Modules'
-          ],
+      ],
+      **extra
      )
