aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <distutils-sig@python.org>2004-06-15 19:00:03 +0000
committerFred Drake <distutils-sig@python.org>2004-06-15 19:00:03 +0000
commit0f429b9bc6894b7a8fbb6cfa587a33a9b9d8ac8f (patch)
treea16a8cbe8a726c465da3cc0934c9789c2f327147
parentdfc00cc146f9d8c387ec61c05bad3f716532ee2a (diff)
downloadexternal_python_setuptools-0f429b9bc6894b7a8fbb6cfa587a33a9b9d8ac8f.tar.gz
external_python_setuptools-0f429b9bc6894b7a8fbb6cfa587a33a9b9d8ac8f.tar.bz2
external_python_setuptools-0f429b9bc6894b7a8fbb6cfa587a33a9b9d8ac8f.zip
fix to make things continue to work when we're *not* running under
Python 2.4; this was broken by my earlier change to avoid stomping on Python 2.4's build_py command --HG-- branch : setuptools extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/trunk/setuptools%4040902
-rw-r--r--setuptools/dist.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index 1c61924d..4d297c93 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -56,13 +56,15 @@ class Distribution(_Distribution):
"""
def __init__ (self, attrs=None):
+ have_package_data = hasattr(self, "package_data")
+ if not have_package_data:
+ self.package_data = {}
self.features = {}
self.test_suite = None
self.requires = []
_Distribution.__init__(self,attrs)
- if not hasattr(self, "package_data"):
+ if not have_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)