A trip down memory lane. Barry checked in this test with 2.3-style

imports of test_support.  That causes multiple copies of test_support
to get loaded, and the one used by test_base64.py didn't see the proper
value of verbose=False, so spewed output.  That in turn apparenly caused
Barry to check in an expected-results output file, but a unitttest-based
test should never have one of those.  I noticed this because, on Windows,
the final unittest output line contains the number of seconds needed to
run the test, and that varied on *some* runs when I tried it, causing
bogus test failures.

Anyway, this gets rid of the expected-output file again, and changes
the imports to work with 2.2's way of doing this.

diff --git a/Lib/test/output/test_base64 b/Lib/test/output/test_base64
deleted file mode 100644 (file)
index ec6ac2b..0000000
--- a/Lib/test/output/test_base64
+++ /dev/null
@@ -1,8 +0,0 @@
-test_base64
-Testing decode string ... ok
-Testing encode string ... ok
-
-----------------------------------------------------------------------
-Ran 2 tests in 0.001s
-
-OK

diff --git a/Lib/test/test_base64.py b/Lib/test/test_base64.py
index 42e3c81d7305dc44a740748ae06364f4f75433e2..197997b685f506ce24597bf6146cbf7396b2cb0a 100644 (file)
--- a/Lib/test/test_base64.py
+++ b/Lib/test/test_base64.py
@@ -1,5 +1,5 @@
 import unittest
-from test import test_support
+import test_support
 import base64
 from binascii import Error as binascii_error