Merged revisions 86223-86224,86226,86234 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r86223 | eric.araujo | 2010-11-06 00:51:56 +0100 (sam., 06 nov. 2010) | 2 lines

  Always close files in distutils code and tests (#10252).
........
  r86224 | eric.araujo | 2010-11-06 00:58:34 +0100 (sam., 06 nov. 2010) | 2 lines

  Add missing entry for r86223.
........
  r86226 | eric.araujo | 2010-11-06 00:59:32 +0100 (sam., 06 nov. 2010) | 2 lines

  Of course, I forgot one file in r86223.
........
  r86234 | eric.araujo | 2010-11-06 03:10:32 +0100 (sam., 06 nov. 2010) | 2 lines

  Also close file descriptors from os.popen and subprocess.Popen
........

ccompiler.py

@@ -794,6 +794,7 @@ class CCompiler:
             library_dirs = []
         fd, fname = tempfile.mkstemp(".c", funcname, text=True)
         f = os.fdopen(fd, "w")
+        try:
             for incl in includes:
                 f.write("""#include "%s"\n""" % incl)
             f.write("""\
@@ -801,6 +802,7 @@ main (int argc, char **argv) {
     %s();
 }
 """ % funcname)
+        finally:
             f.close()
         try:
             objects = self.compile([fname], include_dirs=include_dirs)

command/bdist_rpm.py

@@ -355,6 +355,7 @@ class bdist_rpm (Command):
             src_rpm, non_src_rpm, spec_path)
 
         out = os.popen(q_cmd)
+        try:
             binary_rpms = []
             source_rpm = None
             while 1:
@@ -372,6 +373,9 @@ class bdist_rpm (Command):
             if status:
                 raise DistutilsExecError("Failed to execute: %s" % repr(q_cmd))
 
+        finally:
+            out.close()
+
         self.spawn(rpm_cmd)
 
         if not self.dry_run:

command/bdist_wininst.py

@@ -356,5 +356,9 @@ class bdist_wininst (Command):
             sfix = ''
 
         filename = os.path.join(directory, "wininst-%.1f%s.exe" % (bv, sfix))
-        return open(filename, "rb").read()
+        f = open(filename, "rb")
+        try:
+            return f.read()
+        finally:
+            f.close()
 # class bdist_wininst

command/upload.py

@@ -79,7 +79,11 @@ class upload(PyPIRCCommand):
 
         # Fill in the data - send all the meta-data in case we need to
         # register a new release
-        content = open(filename,'rb').read()
+        f = open(filename,'rb')
+        try:
+            content = f.read()
+        finally:
+            f.close()
         meta = self.distribution.metadata
         data = {
             # action

core.py

@@ -216,7 +216,11 @@ def run_setup(script_name, script_args=None, stop_after="run"):
             sys.argv[0] = script_name
             if script_args is not None:
                 sys.argv[1:] = script_args
-            exec open(script_name, 'r').read() in g, l
+            f = open(script_name)
+            try:
+                exec f.read() in g, l
+            finally:
+                f.close()
         finally:
             sys.argv = save_argv
             _setup_stop_after = None

cygwinccompiler.py

@@ -382,7 +382,9 @@ def check_config_h():
         # It would probably better to read single lines to search.
         # But we do this only once, and it is fast enough
         f = open(fn)
+        try:
             s = f.read()
+        finally:
             f.close()
 
     except IOError, exc:

dist.py

@@ -1101,8 +1101,10 @@ class DistributionMetadata:
     def write_pkg_info(self, base_dir):
         """Write the PKG-INFO file into the release tree.
         """
-        pkg_info = open( os.path.join(base_dir, 'PKG-INFO'), 'w')
+        pkg_info = open(os.path.join(base_dir, 'PKG-INFO'), 'w')
+        try:
             self.write_pkg_file(pkg_info)
+        finally:
             pkg_info.close()
 
     def write_pkg_file(self, file):

emxccompiler.py

@@ -272,7 +272,9 @@ def check_config_h():
         # It would probably better to read single lines to search.
         # But we do this only once, and it is fast enough
         f = open(fn)
+        try:
             s = f.read()
+        finally:
             f.close()
 
     except IOError, exc:
@@ -300,7 +302,9 @@ def get_versions():
     gcc_exe = find_executable('gcc')
     if gcc_exe:
         out = os.popen(gcc_exe + ' -dumpversion','r')
+        try:
             out_string = out.read()
+        finally:
             out.close()
         result = re.search('(\d+\.\d+\.\d+)',out_string)
         if result:

extension.py

@@ -150,6 +150,7 @@ def read_setup_file (filename):
     file = TextFile(filename,
                     strip_comments=1, skip_blanks=1, join_lines=1,
                     lstrip_ws=1, rstrip_ws=1)
+    try:
         extensions = []
 
         while 1:
@@ -221,6 +222,12 @@ def read_setup_file (filename):
                     ext.extra_link_args.append(word)
                     if not value:
                         append_next_word = ext.extra_link_args
+                elif word == "-Xcompiler":
+                    append_next_word = ext.extra_compile_args
+                elif switch == "-u":
+                    ext.extra_link_args.append(word)
+                    if not value:
+                        append_next_word = ext.extra_link_args
                 elif suffix in (".a", ".so", ".sl", ".o", ".dylib"):
                     # NB. a really faithful emulation of makesetup would
                     # append a .o file to extra_objects only if it
@@ -231,6 +238,8 @@ def read_setup_file (filename):
                     file.warn("unrecognized argument '%s'" % word)
 
             extensions.append(ext)
+    finally:
+        file.close()
 
         #print "module:", module
         #print "source files:", source_files

file_util.py

@@ -224,6 +224,8 @@ def write_file (filename, contents):
     sequence of strings without line terminators) to it.
     """
     f = open(filename, "w")
+    try:
         for line in contents:
             f.write(line + "\n")
+    finally:
         f.close()

msvc9compiler.py

@@ -273,10 +273,12 @@ def query_vcvarsall(version, arch="x86"):
     popen = subprocess.Popen('"%s" %s & set' % (vcvarsall, arch),
                              stdout=subprocess.PIPE,
                              stderr=subprocess.PIPE)
-
+    try:
         stdout, stderr = popen.communicate()
         if popen.wait() != 0:
             raise DistutilsPlatformError(stderr.decode("mbcs"))
+    finally:
+        popen.close()
 
     stdout = stdout.decode("mbcs")
     for line in stdout.split("\n"):

tests/test_build_py.py

@@ -19,10 +19,14 @@ class BuildPyTestCase(support.TempdirManager,
     def _setup_package_data(self):
         sources = self.mkdtemp()
         f = open(os.path.join(sources, "__init__.py"), "w")
+        try:
             f.write("# Pretend this is a package.")
+        finally:
             f.close()
         f = open(os.path.join(sources, "README.txt"), "w")
+        try:
             f.write("Info about this package")
+        finally:
             f.close()
 
         destination = self.mkdtemp()

tests/test_build_scripts.py

@@ -71,7 +71,9 @@ class BuildScriptsTestCase(support.TempdirManager,
 
     def write_script(self, dir, name, text):
         f = open(os.path.join(dir, name), "w")
+        try:
             f.write(text)
+        finally:
             f.close()
 
     def test_version_int(self):

tests/test_config.py

@@ -108,8 +108,12 @@ class PyPIRCCommandTestCase(support.TempdirManager,
         self.assertTrue(not os.path.exists(rc))
         cmd._store_pypirc('tarek', 'xxx')
         self.assertTrue(os.path.exists(rc))
-        content = open(rc).read()
+        f = open(rc)
+        try:
+            content = f.read()
             self.assertEquals(content, WANTED)
+        finally:
+            f.close()
 
 def test_suite():
     return unittest.makeSuite(PyPIRCCommandTestCase)

tests/test_core.py

@@ -52,7 +52,11 @@ class CoreTestCase(support.EnvironGuard, unittest.TestCase):
             shutil.rmtree(path)
 
     def write_setup(self, text, path=test.test_support.TESTFN):
-        open(path, "w").write(text)
+        f = open(path, "w")
+        try:
+            f.write(text)
+        finally:
+            f.close()
         return path
 
     def test_run_setup_provides_file(self):

tests/test_dir_util.py

@@ -88,7 +88,9 @@ class DirUtilTestCase(support.TempdirManager, unittest.TestCase):
         mkpath(self.target, verbose=0)
         a_file = os.path.join(self.target, 'ok.txt')
         f = open(a_file, 'w')
+        try:
             f.write('some content')
+        finally:
             f.close()
 
         wanted = ['copying %s -> %s' % (a_file, self.target2)]

tests/test_dist.py

@@ -102,11 +102,14 @@ class DistributionTestCase(support.TempdirManager,
 
     def test_command_packages_configfile(self):
         sys.argv.append("build")
+        self.addCleanup(os.unlink, TESTFN)
         f = open(TESTFN, "w")
         try:
             print >>f, "[global]"
             print >>f, "command_packages = foo.bar, splat"
+        finally:
             f.close()
+
         d = self.create_distribution([TESTFN])
         self.assertEqual(d.get_command_packages(),
                          ["distutils.command", "foo.bar", "splat"])
@@ -123,9 +126,6 @@ class DistributionTestCase(support.TempdirManager,
         d = self.create_distribution([TESTFN])
         self.assertEqual(d.get_command_packages(), ["distutils.command"])
 
-        finally:
-            os.unlink(TESTFN)
-
     def test_write_pkg_file(self):
         # Check DistributionMetadata handling of Unicode fields
         tmp_dir = self.mkdtemp()
@@ -341,7 +341,9 @@ class MetadataTestCase(support.TempdirManager, support.EnvironGuard,
         temp_dir = self.mkdtemp()
         user_filename = os.path.join(temp_dir, user_filename)
         f = open(user_filename, 'w')
+        try:
             f.write('.')
+        finally:
             f.close()
 
         try:

tests/test_file_util.py

@@ -31,7 +31,9 @@ class FileUtilTestCase(support.TempdirManager, unittest.TestCase):
 
     def test_move_file_verbosity(self):
         f = open(self.source, 'w')
+        try:
             f.write('some content')
+        finally:
             f.close()
 
         move_file(self.source, self.target, verbose=0)

tests/test_install_scripts.py

@@ -42,7 +42,9 @@ class InstallScriptsTestCase(support.TempdirManager,
         def write_script(name, text):
             expected.append(name)
             f = open(os.path.join(source, name), "w")
+            try:
                 f.write(text)
+            finally:
                 f.close()
 
         write_script("script1.py", ("#! /usr/bin/env python2.3\n"

tests/test_msvc9compiler.py

@@ -113,7 +113,9 @@ class msvc9compilerTestCase(support.TempdirManager,
         tempdir = self.mkdtemp()
         manifest = os.path.join(tempdir, 'manifest')
         f = open(manifest, 'w')
+        try:
             f.write(_MANIFEST)
+        finally:
             f.close()
 
         compiler = MSVCCompiler()
@@ -121,8 +123,10 @@ class msvc9compilerTestCase(support.TempdirManager,
 
         # see what we got
         f = open(manifest)
+        try:
             # removing trailing spaces
             content = '\n'.join([line.rstrip() for line in f.readlines()])
+        finally:
             f.close()
 
         # makes sure the manifest was properly cleaned

tests/test_register.py

@@ -119,8 +119,12 @@ class RegisterTestCase(PyPIRCCommandTestCase):
         self.assertTrue(os.path.exists(self.rc))
 
         # with the content similar to WANTED_PYPIRC
-        content = open(self.rc).read()
+        f = open(self.rc)
+        try:
+            content = f.read()
             self.assertEquals(content, WANTED_PYPIRC)
+        finally:
+            f.close()
 
         # now let's make sure the .pypirc file generated
         # really works : we shouldn't be asked anything

tests/test_sdist.py

@@ -234,8 +234,12 @@ class SDistTestCase(PyPIRCCommandTestCase):
         self.assertEquals(len(content), 11)
 
         # checking the MANIFEST
-        manifest = open(join(self.tmp_dir, 'MANIFEST')).read()
+        f = open(join(self.tmp_dir, 'MANIFEST'))
+        try:
+            manifest = f.read()
             self.assertEquals(manifest, MANIFEST % {'sep': os.sep})
+        finally:
+            f.close()
 
     @unittest.skipUnless(zlib, "requires zlib")
     def test_metadata_check_option(self):

tests/test_sysconfig.py

@@ -50,8 +50,10 @@ class SysconfigTestCase(support.EnvironGuard,
     def test_parse_makefile_base(self):
         self.makefile = test.test_support.TESTFN
         fd = open(self.makefile, 'w')
+        try:
             fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=LIB'" '\n')
             fd.write('VAR=$OTHER\nOTHER=foo')
+        finally:
             fd.close()
         d = sysconfig.parse_makefile(self.makefile)
         self.assertEquals(d, {'CONFIG_ARGS': "'--arg1=optarg1' 'ENV=LIB'",
@@ -60,8 +62,10 @@ class SysconfigTestCase(support.EnvironGuard,
     def test_parse_makefile_literal_dollar(self):
         self.makefile = test.test_support.TESTFN
         fd = open(self.makefile, 'w')
+        try:
             fd.write(r"CONFIG_ARGS=  '--arg1=optarg1' 'ENV=\$$LIB'" '\n')
             fd.write('VAR=$OTHER\nOTHER=foo')
+        finally:
             fd.close()
         d = sysconfig.parse_makefile(self.makefile)
         self.assertEquals(d, {'CONFIG_ARGS': r"'--arg1=optarg1' 'ENV=\$LIB'",

tests/test_text_file.py

@@ -58,28 +58,46 @@ class TextFileTestCase(support.TempdirManager, unittest.TestCase):
         finally:
             out_file.close()
 
-        in_file = TextFile (filename, strip_comments=0, skip_blanks=0,
+        in_file = TextFile(filename, strip_comments=0, skip_blanks=0,
                            lstrip_ws=0, rstrip_ws=0)
-        test_input (1, "no processing", in_file, result1)
+        try:
+            test_input(1, "no processing", in_file, result1)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=0,
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=0,
                            lstrip_ws=0, rstrip_ws=0)
-        test_input (2, "strip comments", in_file, result2)
+        try:
+            test_input(2, "strip comments", in_file, result2)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=0, skip_blanks=1,
+        in_file = TextFile(filename, strip_comments=0, skip_blanks=1,
                            lstrip_ws=0, rstrip_ws=0)
-        test_input (3, "strip blanks", in_file, result3)
+        try:
+            test_input(3, "strip blanks", in_file, result3)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename)
-        test_input (4, "default processing", in_file, result4)
+        in_file = TextFile(filename)
+        try:
+            test_input(4, "default processing", in_file, result4)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
                            join_lines=1, rstrip_ws=1)
-        test_input (5, "join lines without collapsing", in_file, result5)
+        try:
+            test_input(5, "join lines without collapsing", in_file, result5)
+        finally:
+            in_file.close()
 
-        in_file = TextFile (filename, strip_comments=1, skip_blanks=1,
+        in_file = TextFile(filename, strip_comments=1, skip_blanks=1,
                            join_lines=1, rstrip_ws=1, collapse_join=1)
-        test_input (6, "join lines with collapsing", in_file, result6)
+        try:
+            test_input(6, "join lines with collapsing", in_file, result6)
+        finally:
+            in_file.close()
 
 def test_suite():
     return unittest.makeSuite(TextFileTestCase)

util.py

@@ -116,13 +116,15 @@ def get_platform ():
                 # behaviour.
                 pass
             else:
+                try:
                     m = re.search(
                             r'<key>ProductUserVisibleVersion</key>\s*' +
                             r'<string>(.*?)</string>', f.read())
-                f.close()
                     if m is not None:
                         macrelease = '.'.join(m.group(1).split('.')[:2])
                     # else: fall back to the default behaviour
+                finally:
+                    f.close()
 
         if not macver:
             macver = macrelease