From: Tarek Ziadé <ziade.tarek@gmail.com>
Date: Sat, 3 Oct 2009 00:07:35 +0000 (+0000)
Subject: removing the last remaning apply() calls
X-Git-Tag: v2.7a1~427
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f638486cf09816668c662241c160dad863582067;p=python

removing the last remaning apply() calls
---

diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index 75318eba61..4ace7bdbf0 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 55607e5b53..3e2cd35385 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 7cf05098ed..4aac6d397a 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 ---------------------------