5 files changed, 2 insertions, 27 deletions
diff --git a/Lib/test/output/test_long b/Lib/test/output/test_long
index 41ecbce7dd..452826450b 100644
--- a/Lib/test/output/test_long
+++ b/Lib/test/output/test_long
@@ -3,4 +3,3 @@ long / * % divmod
 long bit-operation identities
 long str/hex/oct/atol
 long miscellaneous operations
-
diff --git a/Lib/test/output/test_popen2 b/Lib/test/output/test_popen2
index e13034d011..1fadf1b99f 100644
--- a/Lib/test/output/test_popen2
+++ b/Lib/test/output/test_popen2
@@ -2,4 +2,3 @@ test_popen2
 testing popen2...
 testing popen3...
 All OK
-
diff --git a/Lib/test/output/test_select b/Lib/test/output/test_select
index d731e0afb4..e8d0cb5e44 100644
--- a/Lib/test/output/test_select
+++ b/Lib/test/output/test_select
@@ -1,25 +1 @@
 test_select
-timeout = 0
-timeout = 1
-'testing...\012'
-timeout = 2
-'testing...\012'
-timeout = 4
-'testing...\012'
-timeout = 8
-'testing...\012'
-timeout = 16
-'testing...\012'
-timeout = None
-'testing...\012'
-timeout = None
-'testing...\012'
-timeout = None
-'testing...\012'
-timeout = None
-'testing...\012'
-timeout = None
-'testing...\012'
-timeout = None
-''
-EOF
diff --git a/Lib/test/regrtest.py b/Lib/test/regrtest.py
index 27b2b03955..dbaee75624 100755
--- a/Lib/test/regrtest.py
+++ b/Lib/test/regrtest.py
@@ -212,6 +212,8 @@ def runtest(test, generate, verbose, testdir = None):
                 sys.stdout = cfp
                 print test              # Output file starts with test name
             __import__(test, globals(), locals(), [])
+            if cfp and not (generate or verbose):
+                cfp.close()
         finally:
             sys.stdout = save_stdout
     except ImportError, msg:
diff --git a/Lib/test/test_select.py b/Lib/test/test_select.py
index 60de3600bc..1a7bf4b862 100644
--- a/Lib/test/test_select.py
+++ b/Lib/test/test_select.py
@@ -45,7 +45,6 @@ def test():
                 if verbose:
                         print 'timeout =', tout
                 rfd, wfd, xfd = select.select([p], [], [], tout)
-##              print rfd, wfd, xfd
                 if (rfd, wfd, xfd) == ([], [], []):
                         continue
                 if (rfd, wfd, xfd) == ([p], [], []):