summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-10-03 00:07:35 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-10-03 00:07:35 (GMT)
commitf638486cf09816668c662241c160dad863582067 (patch)
treed4dad17b0647f98a0ddef990524168ef8323cad2
parent1b48671ef11a635fc452e35d08c14a601baa1db7 (diff)
downloadcpython-f638486cf09816668c662241c160dad863582067.zip
cpython-f638486cf09816668c662241c160dad863582067.tar.gz
cpython-f638486cf09816668c662241c160dad863582067.tar.bz2
removing the last remaning apply() calls
-rw-r--r--Lib/distutils/archive_util.py2
-rw-r--r--Lib/distutils/dir_util.py2
-rw-r--r--Lib/distutils/filelist.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index 75318eb..4ace7bd 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -233,7 +233,7 @@ def make_archive(base_name, format, root_dir=None, base_dir=None, verbose=0,
kwargs['owner'] = owner
kwargs['group'] = group
- filename = apply(func, (base_name, base_dir), kwargs)
+ filename = func(base_name, base_dir, **kwargs)
if root_dir is not None:
log.debug("changing back to '%s'", save_cwd)
os.chdir(save_cwd)
diff --git a/Lib/distutils/dir_util.py b/Lib/distutils/dir_util.py
index 55607e5..3e2cd35 100644
--- a/Lib/distutils/dir_util.py
+++ b/Lib/distutils/dir_util.py
@@ -190,7 +190,7 @@ def remove_tree(directory, verbose=1, dry_run=0):
_build_cmdtuple(directory, cmdtuples)
for cmd in cmdtuples:
try:
- apply(cmd[0], (cmd[1],))
+ cmd[0](cmd[1])
# remove dir from cache if it's already there
abspath = os.path.abspath(cmd[1])
if abspath in _path_created:
diff --git a/Lib/distutils/filelist.py b/Lib/distutils/filelist.py
index 7cf0509..4aac6d3 100644
--- a/Lib/distutils/filelist.py
+++ b/Lib/distutils/filelist.py
@@ -61,7 +61,7 @@ class FileList:
sortable_files.sort()
self.files = []
for sort_tuple in sortable_files:
- self.files.append(apply(os.path.join, sort_tuple))
+ self.files.append(os.path.join(*sort_tuple))
# -- Other miscellaneous utility methods ---------------------------