Ticket #2527: setuptools_optional.patch.txt

Index: setup.py
===================================================================
--- setup.py    (revision 15040)
+++ setup.py    (working copy)
@@ -1,50 +1,111 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # -*- test-case-name: "nevow.test -xformless.test" -*-
 
-import os.path
-from distutils.core import setup
-import glob
-import sys
-import setupcommon
+from nevow import __version__ as version
 
-# Where should our data files go?
-# They want to go in our package directory , which is under site-packages.
-# We determine the location of site-packages here, for later use. It will be
-# interpreted as relative to sys.prefix.
-# This junk can go once we decide to drop Python 2.3 support or switch to
-# setuptools. package_data is a much cleaner solution.
-if sys.platform.lower().startswith('win'):
-    site_packages = 'Lib/site-packages/'
+try:
+    import setuptools
+except ImportError:
+    setuptools = None
+
+
+setupdict = {
+    'name': 'Nevow', 
+    'version': version,
+    'maintainer': 'Divmod, Inc.', 
+    'maintainer_email': 'support@divmod.org', 
+    'description': 'Web Application Construction Kit', 
+    'url': 'http://divmod.org/trac/wiki/DivmodNevow', 
+    'license': 'MIT', 
+    'platforms': ["any"], 
+    'classifiers': [
+        "Intended Audience :: Developers",
+        "Programming Language :: Python",
+        "Development Status :: 4 - Beta",
+        "Topic :: Internet :: WWW/HTTP :: Dynamic Content"],
+    'scripts': ['bin/nevow-xmlgettext', 'bin/nit'],
+    'package_data': {
+            'formless': [
+                'freeform-default.css'
+                ],
+            'nevow': [
+                'Canvas.swf',
+                '*.css',
+                '*.js',
+                'js/Divmod/*.js',
+                'js/Nevow/*.js',
+                'js/Nevow/Test/*.js',
+                'js/Nevow/Athena/Tests/*.js',
+                'js/Divmod/Runtime/*.js',
+                'js/Nevow/Athena/*.js',
+                'js/Nevow/TagLibrary/*.js',
+                'js/Divmod/Test/*.js',
+                'js/PythonTestSupport/*.js',
+                ],
+            'nevow.athena_private': [
+                '*.png'
+                ],
+            'nevow.taglibrary': [
+                '*.css',
+                '*.js'
+                ],
+            'nevow.livetrial': [
+                '*.css',
+                '*.js'
+                ],
+            'nevow.test': [
+                '*.js'
+                ],
+            'nevow.test.test_package.Foo': [
+                '*.js'
+                ],
+            'nevow.test.test_package.Foo.Baz': [
+                '*.js'
+                ],
+            }
+}
+
+if setuptools:
+    # Importing setuptools worked -- then we do the following setup script:
+    from setuptools import setup, find_packages
+
+    setupdict['packages'] = find_packages()
 else:
-    version = '.'.join([str(i) for i in sys.version_info[:2]])
-    site_packages = 'lib/python' + version + '/site-packages/'
+    # No setuptools -- decide where the data files should go and explicitly list
+    # the packages.
 
-# Turn the package_data into a data_files for 2.3 compatability
-data_files = []
-for pkg, patterns in setupcommon.package_data.items():
-    pkgdir = os.path.join(*pkg.split('.'))
-    for pattern in patterns:
-        globdir = os.path.dirname(pattern)
-        files = glob.glob(os.path.join(pkgdir, pattern))
-        data_files.append((os.path.join(site_packages,pkgdir,globdir),files))
+    from distutils.core import setup
 
-# We need to list the packages explicitly.
-packages = [
-    'formless', 'formless.test', 'nevow', 'nevow.flat',
-    'nevow.scripts', 'nevow.test', 'nevow.taglibrary',
-    'nevow.plugins', 'nevow.livetrial', 'twisted.plugins']
+    import os.path
+    import glob
+    import sys
 
-setup(
-    name=setupcommon.name,
-    version=setupcommon.version,
-    maintainer=setupcommon.maintainer,
-    maintainer_email=setupcommon.maintainer_email,
-    description=setupcommon.description,
-    url=setupcommon.url,
-    license=setupcommon.license,
-    platforms=setupcommon.platforms,
-    classifiers=setupcommon.classifiers,
-    packages=packages,
-    scripts=setupcommon.scripts,
-    data_files=data_files,
-    )
+    # Where should our data files go?
+    # They want to go in our package directory , which is under site-packages.
+    # We determine the location of site-packages here, for later use. It will be
+    # interpreted as relative to sys.prefix.
+
+    if sys.platform.lower().startswith('win'):
+        site_packages = 'Lib/site-packages/'
+    else:
+        version = '.'.join([str(i) for i in sys.version_info[:2]])
+        site_packages = 'lib/python' + version + '/site-packages/'
+
+    # Turn the package_data into a data_files for 2.3 compatability
+    setupdict['data_files'] = []
+    for pkg, patterns in setupdict['package_data'].items():
+        pkgdir = os.path.join(*pkg.split('.'))
+        for pattern in patterns:
+            globdir = os.path.dirname(pattern)
+            files = glob.glob(os.path.join(pkgdir, pattern))
+            setupdict['data_files'].append((os.path.join(site_packages,pkgdir,globdir),files))
+
+    # We need to list the packages explicitly.
+    setupdict['packages'] = [
+        'formless', 'formless.test', 'nevow', 'nevow.flat',
+        'nevow.scripts', 'nevow.test', 'nevow.taglibrary',
+        'nevow.plugins', 'nevow.livetrial', 'twisted.plugins']
+
+
+setup(**setupdict)
+
Index: setupcommon.py
===================================================================
--- setupcommon.py      (revision 15040)
+++ setupcommon.py      (working copy)
@@ -1,53 +0,0 @@
-name='Nevow'
-from nevow import __version__ as version
-maintainer = 'Divmod, Inc.'
-maintainer_email = 'support@divmod.org'
-description = 'Web Application Construction Kit'
-url='http://divmod.org/trac/wiki/DivmodNevow'
-license='MIT'
-platforms=["any"]
-classifiers=[
-    "Intended Audience :: Developers",
-    "Programming Language :: Python",
-    "Development Status :: 4 - Beta",
-    "Topic :: Internet :: WWW/HTTP :: Dynamic Content"]
-scripts=['bin/nevow-xmlgettext', 'bin/nit']
-package_data={
-        'formless': [
-            'freeform-default.css'
-            ],
-        'nevow': [
-            'Canvas.swf',
-            '*.css',
-            '*.js',
-            'js/Divmod/*.js',
-            'js/Nevow/*.js',
-            'js/Nevow/Test/*.js',
-            'js/Nevow/Athena/Tests/*.js',
-            'js/Divmod/Runtime/*.js',
-            'js/Nevow/Athena/*.js',
-            'js/Nevow/TagLibrary/*.js',
-            'js/Divmod/Test/*.js',
-            'js/PythonTestSupport/*.js',
-            ],
-        'nevow.athena_private': [
-            '*.png'
-            ],
-        'nevow.taglibrary': [
-            '*.css',
-            '*.js'
-            ],
-        'nevow.livetrial': [
-            '*.css',
-            '*.js'
-            ],
-        'nevow.test': [
-            '*.js'
-            ],
-        'nevow.test.test_package.Foo': [
-            '*.js'
-            ],
-        'nevow.test.test_package.Foo.Baz': [
-            '*.js'
-            ],
-        }
Index: setup_egg.py
===================================================================
--- setup_egg.py        (revision 15040)
+++ setup_egg.py        (working copy)
@@ -1,28 +0,0 @@
-#!/usr/bin/env python
-# -*- test-case-name: "nevow.test -xformless.test" -*-
-
-# Use setuptools, it's easier
-from ez_setup import use_setuptools
-use_setuptools()
-from setuptools import setup, find_packages
-import setupcommon
-
-# Import Nevow for the version string
-import nevow
-
-setup(
-    name=setupcommon.name,
-    version=setupcommon.version,
-    maintainer=setupcommon.maintainer,
-    maintainer_email=setupcommon.maintainer_email,
-    description=setupcommon.description,
-    url=setupcommon.url,
-    license=setupcommon.license,
-    platforms=setupcommon.platforms,
-    classifiers=setupcommon.classifiers,
-    packages=find_packages(),
-    scripts=setupcommon.scripts,
-    package_data=setupcommon.package_data,
-    zip_safe = True,
-    )
-