[Zope-Checkins] CVS: Zope/inst - setup.py:1.1.2.17
Fred L. Drake, Jr.
fred@zope.com
Mon, 27 Jan 2003 11:39:47 -0500
Update of /cvs-repository/Zope/inst
In directory cvs.zope.org:/tmp/cvs-serv25412
Modified Files:
Tag: chrism-install-branch
setup.py
Log Message:
Remove unnecessary imports.
=== Zope/inst/setup.py 1.1.2.16 => 1.1.2.17 ===
--- Zope/inst/setup.py:1.1.2.16 Sat Jan 25 18:04:19 2003
+++ Zope/inst/setup.py Mon Jan 27 11:39:45 2003
@@ -63,10 +63,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.errors import DistutilsFileError
from distutils.util import convert_path
from glob import glob
@@ -81,7 +80,7 @@
def run(self):
self.mkpath(self.install_dir)
for f in self.data_files:
- if type(f) == StringType:
+ if isinstance(f, str):
# it's a simple file, so copy it
f = convert_path(f)
gl = glob(f)
@@ -670,7 +669,7 @@
name='Top-level',
author=AUTHOR,
- py_modules=['Globals', 'ImageFile', 'xmlrpclib','zope', 'Lifetime']
+ py_modules=['Globals', 'ImageFile', 'xmlrpclib', 'zope', 'Lifetime']
)
# Products base directory
@@ -892,7 +891,7 @@
packages=['Products.SiteErrorLog'],
data_files=[['Products/SiteErrorLog/www',
- ['Products/SiteErrorLog/www/*']]],
+ ['Products/SiteErrorLog/www/*']]],
cmdclass={'install_data': install_data}
)