[Python-checkins] r73168 - in python/branches/py3k: Lib/distutils/extension.py Lib/distutils/tests/Setup.sample Lib/distutils/tests/test_extension.py

[tarek.ziade]

Author: tarek.ziade
Date: Wed Jun  3 12:31:15 2009
New Revision: 73168

Log:
Merged revisions 73166 via svnmerge from 
svn+ssh://pythondev@svn.python.org/python/trunk

........
  r73166 | tarek.ziade | 2009-06-03 12:26:26 +0200 (Wed, 03 Jun 2009) | 1 line
  
  added some tests for distutils.extension + code cleanup
........


Added:
   python/branches/py3k/Lib/distutils/tests/Setup.sample
      - copied unchanged from r73166, /python/trunk/Lib/distutils/tests/Setup.sample
   python/branches/py3k/Lib/distutils/tests/test_extension.py
      - copied unchanged from r73166, /python/trunk/Lib/distutils/tests/test_extension.py
Modified:
   python/branches/py3k/   (props changed)
   python/branches/py3k/Lib/distutils/extension.py

Modified: python/branches/py3k/Lib/distutils/extension.py
==============================================================================
--- python/branches/py3k/Lib/distutils/extension.py	(original)
+++ python/branches/py3k/Lib/distutils/extension.py	Wed Jun  3 12:31:15 2009
@@ -139,8 +139,10 @@
 
 
 def read_setup_file(filename):
-    from distutils.sysconfig import \
-         parse_makefile, expand_makefile_vars, _variable_rx
+    """Reads a Setup file and returns Extension instances."""
+    from distutils.sysconfig import (parse_makefile, expand_makefile_vars,
+                                     _variable_rx)
+
     from distutils.text_file import TextFile
     from distutils.util import split_quoted
 
@@ -165,10 +167,8 @@
             file.warn("'%s' lines not handled yet" % line)
             continue
 
-        #print "original line: " + line
         line = expand_makefile_vars(line, vars)
         words = split_quoted(line)
-        #print "expanded line: " + line
 
         # NB. this parses a slightly different syntax than the old
         # makesetup script: here, there must be exactly one extension per
@@ -234,13 +234,4 @@
 
         extensions.append(ext)
 
-        #print "module:", module
-        #print "source files:", source_files
-        #print "cpp args:", cpp_args
-        #print "lib args:", library_args
-
-        #extensions[module] = { 'sources': source_files,
-        #                       'cpp_args': cpp_args,
-        #                       'lib_args': library_args }
-
     return extensions