[Python-checkins] python/nondist/sandbox/setuptools/setuptools dist.py, 1.3, 1.4

Mon Jun 14 10:15:37 EDT 2004

Update of /cvsroot/python/python/nondist/sandbox/setuptools/setuptools
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14032/setuptools
Modified Files:
	dist.py 
Log Message:
Deal with the distutils on the head; package_data may already be supported.
In this case, setuptools need not override the build_py command.
Index: dist.py
===================================================================
RCS file: /cvsroot/python/python/nondist/sandbox/setuptools/setuptools/dist.py,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** dist.py	22 Mar 2004 01:12:31 -0000	1.3
--- dist.py	14 Jun 2004 14:15:34 -0000	1.4
***************
*** 3,7 ****
 from distutils.core import Extension
 from setuptools.depends import Require
- from setuptools.command.build_py import build_py
 from setuptools.command.build_ext import build_ext
 from setuptools.command.install import install
--- 3,6 ----
***************
*** 59,67 ****
 def __init__ (self, attrs=None):
 self.features = {}
- self.package_data = {}
 self.test_suite = None
 self.requires = []
 _Distribution.__init__(self,attrs)
! self.cmdclass.setdefault('build_py',build_py)
 self.cmdclass.setdefault('build_ext',build_ext)
 self.cmdclass.setdefault('install',install)
--- 58,68 ----
 def __init__ (self, attrs=None):
 self.features = {}
 self.test_suite = None
 self.requires = []
 _Distribution.__init__(self,attrs)
! if not hasattr(self, "package_data"):
! from setuptools.command.build_py import build_py
! self.package_data = {}
! self.cmdclass.setdefault('build_py',build_py)
 self.cmdclass.setdefault('build_ext',build_ext)
 self.cmdclass.setdefault('install',install)