Fix a buch of shallow test failures.
Note: in test_fileinput.py, two tests are disabled until I figure out how
to replace these.
diff --git a/Lib/test/test_tokenize.py b/Lib/test/test_tokenize.py
index 7e1708e..4d8d9f1 100644
--- a/Lib/test/test_tokenize.py
+++ b/Lib/test/test_tokenize.py
@@ -80,7 +80,7 @@
"""
import os, glob, random, time, sys
-from cStringIO import StringIO
+from io import StringIO
from test.test_support import (verbose, findfile, is_resource_enabled,
TestFailed)
from tokenize import (tokenize, generate_tokens, untokenize, tok_name,
@@ -189,6 +189,8 @@
for f in testfiles:
# Print still working message since this test can be really slow
+ if verbose:
+ print(' round trip: ', f, file=sys.__stdout__)
if next_time <= time.time():
next_time = time.time() + _PRINT_WORKING_MSG_INTERVAL
print(' test_main still working, be patient...', file=sys.__stdout__)