diff -u -r Nevow-0.9.18.orig/setup.py Nevow-0.9.18/setup.py --- Nevow-0.9.18.orig/setup.py 2007-04-29 17:51:38.000000000 -0600 +++ Nevow-0.9.18/setup.py 2008-01-23 16:48:33.000000000 -0700 @@ -1,50 +1,77 @@ #!/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 - -# 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: + # Couldn't import setuptools, so use this setup script: + + import os.path + from distutils.core import setup + import glob + import sys + import setupcommon + + # 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/' + 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 + 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)) + + # We need to list the packages explicitly. + packages = [ + 'formless', 'formless.test', 'nevow', 'nevow.flat', + 'nevow.scripts', 'nevow.test', 'nevow.taglibrary', + 'nevow.plugins', 'nevow.livetrial'] + + 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, + ) else: - version = '.'.join([str(i) for i in sys.version_info[:2]]) - site_packages = 'lib/python' + version + '/site-packages/' + # Could import setuptools, so use this setup script: + + from setuptools import setup, find_packages + import setupcommon + + 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, + ) -# 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)) - -# We need to list the packages explicitly. -packages = [ - 'formless', 'formless.test', 'nevow', 'nevow.flat', - 'nevow.scripts', 'nevow.test', 'nevow.taglibrary', - 'nevow.plugins', 'nevow.livetrial'] - -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, - ) Only in Nevow-0.9.18: setup.py~ diff -u -r Nevow-0.9.18.orig/setup_egg.py Nevow-0.9.18/setup_egg.py --- Nevow-0.9.18.orig/setup_egg.py 2005-10-15 15:02:14.000000000 -0600 +++ Nevow-0.9.18/setup_egg.py 2008-01-23 16:48:52.000000000 -0700 @@ -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, - ) -