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

Lib/distutils/command/bdist_rpm.py

@@ -343,6 +343,7 @@ class bdist_rpm(Command):
             src_rpm, non_src_rpm, spec_path)
 
         out = os.popen(q_cmd)
+        try:
             binary_rpms = []
             source_rpm = None
             while True:
@@ -360,6 +361,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:

Lib/distutils/msvc9compiler.py

@@ -263,10 +263,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"):