[Zope-Checkins] CVS: Zope - setup.py:1.18

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope
In directory cvs.zope.org:/tmp/cvs-serv20145

Modified Files:
	setup.py 
Log Message:
Lots of minor changes to remove cosmetic differences between this file
and the version being used in the new-install-branch.


=== Zope/setup.py 1.17 => 1.18 === (857/957 lines abridged)
--- Zope/setup.py:1.17	Sun Jan  5 02:14:46 2003
+++ Zope/setup.py	Fri Mar  7 11:21:56 2003
@@ -8,7 +8,7 @@
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
-# FOR A PARTICULAR PURPOSE
+# FOR A PARTICULAR PURPOSE.
 #
 ##############################################################################
 
@@ -40,11 +40,13 @@
     for Zope to work in this configuration.
 """
 
+import glob
 import os
 import sys
 
-from distutils.core import setup as distutils_setup
-from distutils.extension import Extension
+import distutils.core
+
+from distutils.core import Extension
 
 # This function collects setup information for one massive distutils
 # run to be done at the end of the script.  If you're making a setup.py
@@ -54,7 +56,6 @@
 
 setup_info = {}
 def setup(name=None, author=None, cmdclass=None, **kwargs):
-    setup_info = sys.modules[__name__].setup_info
     for keyword in kwargs.keys():
         if not setup_info.has_key(keyword):
             setup_info[keyword] = []
@@ -63,12 +64,9 @@
 # Override install_data to install into module directories, and to support
 # globbing on data_files.
 
-from types import StringType
 from distutils.command.install import install
 from distutils.command.install_data import install_data
-from distutils.errors import DistutilsFileError, DistutilsOptionError
 from distutils.util import convert_path
-from glob import glob
 
 class install_data(install_data):
     def finalize_options(self):
@@ -81,13 +79,13 @@
     def run(self):

[-=- -=- -=- 857 lines omitted -=- -=- -=-]

     author=AUTHOR,
 
     py_modules=['z2']
-)
+    )
 
 # zpasswd
 setup(
@@ -1089,7 +993,7 @@
     author=AUTHOR,
 
     py_modules=['zpasswd']
-)
+    )
 
 # Default imports
 setup(
@@ -1097,27 +1001,25 @@
     author=AUTHOR,
 
     data_files=[['import', ['import/*.zexp']]],
-    cmdclass={'install_data': install_data}
-)
+    )
 
 # And now, the root-level stuff
 
-distutils_setup(
+distutils.core.setup(
     name='Zope',
     author=AUTHOR,
 
     packages=setup_info.get('packages', []),
     data_files=setup_info.get('data_files', []),
-
     headers=setup_info.get('headers', []),
     ext_modules=setup_info.get('ext_modules', []),
 
     cmdclass={'install': install, 'install_data': install_data}
-)
-distutils_setup(
+    )
+distutils.core.setup(
     name='Zope',
     author=AUTHOR,
 
     py_modules=setup_info.get('py_modules', []),
     cmdclass={'install': install, 'install_data': install_data}
-)
+    )