summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGregory P. Smith <greg@mad-scientist.com>2000-05-13 03:09:50 (GMT)
committerGregory P. Smith <greg@mad-scientist.com>2000-05-13 03:09:50 (GMT)
commit6a901dd1bd1d2cfdd744bf7524ccb9b890b28d06 (patch)
tree8734af57678d71538cc75d4a31f2fc6183fb804f
parentc59d4e07777ddb98013bc21256534bc4898be988 (diff)
downloadcpython-6a901dd1bd1d2cfdd744bf7524ccb9b890b28d06.zip
cpython-6a901dd1bd1d2cfdd744bf7524ccb9b890b28d06.tar.gz
cpython-6a901dd1bd1d2cfdd744bf7524ccb9b890b28d06.tar.bz2
List data files are listed in the Distribution attribute 'data_files',
rather than 'data'.
-rw-r--r--Lib/distutils/command/install_data.py4
-rw-r--r--Lib/distutils/dist.py2
2 files changed, 3 insertions, 3 deletions
diff --git a/Lib/distutils/command/install_data.py b/Lib/distutils/command/install_data.py
index 448614b..fd9836b 100644
--- a/Lib/distutils/command/install_data.py
+++ b/Lib/distutils/command/install_data.py
@@ -17,7 +17,7 @@ class install_data (install_misc):
self._install_dir_from('install_data')
def run (self):
- self._copy_files(self.distribution.data)
+ self._copy_files(self.distribution.data_files)
def get_inputs (self):
- return self.distribution.data or []
+ return self.distribution.data_files or []
diff --git a/Lib/distutils/dist.py b/Lib/distutils/dist.py
index 998cff7..24c8d2b 100644
--- a/Lib/distutils/dist.py
+++ b/Lib/distutils/dist.py
@@ -155,7 +155,7 @@ class Distribution:
self.include_dirs = None
self.extra_path = None
self.scripts = None
- self.data = None
+ self.data_files = None
# And now initialize bookkeeping stuff that can't be supplied by
# the caller at all. 'command_obj' maps command names to