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.
........
This commit is contained in:
Ezio Melotti 2010-08-03 07:51:50 +00:00
parent 55624a2261
commit e511c6ce8d
6 changed files with 13 additions and 12 deletions

View File

@ -160,7 +160,7 @@ def make_archive (base_name, format,
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)

View File

@ -157,7 +157,7 @@ class build_py (Command):
if not self.package_dir:
if path:
return apply(os.path.join, path)
return os.path.join(*path)
else:
return ''
else:
@ -184,7 +184,7 @@ class build_py (Command):
tail.insert(0, pdir)
if tail:
return apply(os.path.join, tail)
return os.path.join(*tail)
else:
return ''

View File

@ -204,7 +204,7 @@ def remove_tree (directory, verbose=0, 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:

View File

@ -68,7 +68,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 ---------------------------

View File

@ -349,6 +349,11 @@ class BuildExtTestCase(support.TempdirManager,
self.assertEquals(wanted, path)
def test_setuptools_compat(self):
try:
# on some platforms, it loads the deprecated "dl" module
test_support.import_module('setuptools_build_ext', deprecated=True)
except test_support.TestSkipped:
return
from setuptools_build_ext import build_ext as setuptools_build_ext
from setuptools_extension import Extension

View File

@ -5,17 +5,13 @@ the test_suite() function there returns a test suite that's ready to
be run.
"""
from test import test_support
import distutils.tests
import test.test_support
import warnings
def test_main():
with warnings.catch_warnings():
warnings.filterwarnings("ignore",
"distutils.sysconfig.\w+ is deprecated",
DeprecationWarning)
test.test_support.run_unittest(distutils.tests.test_suite())
test_support.run_unittest(distutils.tests.test_suite())
test_support.reap_children()
if __name__ == "__main__":