Merged revisions 77704,77752 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r77704 | tarek.ziade | 2010-01-23 10:23:15 +0100 (Sat, 23 Jan 2010) | 1 line
taking sysconfig out of distutils
........
r77752 | tarek.ziade | 2010-01-26 00:19:56 +0100 (Tue, 26 Jan 2010) | 1 line
switched the call order so this call works without suffering from issue #7774
........
diff --git a/Lib/distutils/extension.py b/Lib/distutils/extension.py
index 10aaf7c..ebe5437 100644
--- a/Lib/distutils/extension.py
+++ b/Lib/distutils/extension.py
@@ -134,14 +134,17 @@
def read_setup_file(filename):
"""Reads a Setup file and returns Extension instances."""
- from distutils.sysconfig import (parse_makefile, expand_makefile_vars,
+ warnings.warn('distutils.extensions.read_setup_file is deprecated. '
+ 'It will be removed in the next Python release.')
+ _sysconfig = __import__('sysconfig')
+ from distutils.sysconfig import (expand_makefile_vars,
_variable_rx)
from distutils.text_file import TextFile
from distutils.util import split_quoted
# First pass over the file to gather "VAR = VALUE" assignments.
- vars = parse_makefile(filename)
+ vars = _sysconfig._parse_makefile(filename)
# Second pass to gobble up the real content: lines of the form
# <module> ... [<sourcefile> ...] [<cpparg> ...] [<library> ...]
@@ -161,7 +164,10 @@
file.warn("'%s' lines not handled yet" % line)
continue
- line = expand_makefile_vars(line, vars)
+ with warnings.catch_warnings():
+ warnings.simplefilter("ignore")
+ line = expand_makefile_vars(line, vars)
+
words = split_quoted(line)
# NB. this parses a slightly different syntax than the old