summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorGreg Ward <gward@python.net>2000-09-30 17:34:50 (GMT)
committerGreg Ward <gward@python.net>2000-09-30 17:34:50 (GMT)
commite564278bfdf7c3c5d72c9825d00ee90d1e406aaa (patch)
treea1d0ea68a1b7e317c857ffb88f6c5c94c213facc /Lib
parentff50ad53a92b3ce35f1f6a810a808aba02594bfd (diff)
downloadcpython-e564278bfdf7c3c5d72c9825d00ee90d1e406aaa.zip
cpython-e564278bfdf7c3c5d72c9825d00ee90d1e406aaa.tar.gz
cpython-e564278bfdf7c3c5d72c9825d00ee90d1e406aaa.tar.bz2
Expect a tuple (dest_name, copied) from 'copy_file()'.
Diffstat (limited to 'Lib')
-rw-r--r--Lib/distutils/command/install_data.py4
-rw-r--r--Lib/distutils/command/install_headers.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 9ce1183..d9a4869 100644
--- a/Lib/distutils/command/install_data.py
+++ b/Lib/distutils/command/install_data.py
@@ -52,7 +52,7 @@ class install_data (Command):
self.warn("setup script did not provide a directory for "
"'%s' -- installing right in '%s'" %
(f, self.install_dir))
- out = self.copy_file(f, self.install_dir)
+ (out, _) = self.copy_file(f, self.install_dir)
self.outfiles.append(out)
else:
# it's a tuple with path to install to and a list of files
@@ -63,7 +63,7 @@ class install_data (Command):
dir = change_root(self.root, dir)
self.mkpath(dir)
for data in f[1]:
- out = self.copy_file(data, dir)
+ (out, _) = self.copy_file(data, dir)
self.outfiles.append(out)
def get_inputs (self):
diff --git a/Lib/distutils/command/install_headers.py b/Lib/distutils/command/install_headers.py
index ec0cf44..2d72a07 100644
--- a/Lib/distutils/command/install_headers.py
+++ b/Lib/distutils/command/install_headers.py
@@ -41,7 +41,7 @@ class install_headers (Command):
self.mkpath(self.install_dir)
for header in headers:
- out = self.copy_file(header, self.install_dir)
+ (out, _) = self.copy_file(header, self.install_dir)
self.outfiles.append(out)
def get_inputs (self):