Merged revisions 79191 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r79191 | florent.xicluna | 2010-03-21 13:50:17 +0200 (Sun, 21 Mar 2010) | 3 lines
No more deprecation warnings for distutils.sysconfig, following r78666.
But when the "dl" module is available, it gives a py3k deprecation warning.
........
diff --git a/Lib/distutils/archive_util.py b/Lib/distutils/archive_util.py
index 251c0df..782d4ef 100644
--- a/Lib/distutils/archive_util.py
+++ b/Lib/distutils/archive_util.py
@@ -160,7 +160,7 @@
func = format_info[0]
for (arg,val) in format_info[1]:
kwargs[arg] = val
- filename = apply(func, (base_name, base_dir), kwargs)
+ filename = func(base_name, base_dir, **kwargs)
try:
filename = func(base_name, base_dir, **kwargs)