summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSerhiy Storchaka <storchaka@gmail.com>2014-02-10 17:09:19 (GMT)
committerSerhiy Storchaka <storchaka@gmail.com>2014-02-10 17:09:19 (GMT)
commitd667d72cb75c41f3045d00945ee4652a8b814418 (patch)
treeb90e59581ad204665e8510a2485a27b4f52322f9
parent87a5c515d03f3e2215f3da7b90a4b848ac510879 (diff)
downloadcpython-d667d72cb75c41f3045d00945ee4652a8b814418.zip
cpython-d667d72cb75c41f3045d00945ee4652a8b814418.tar.gz
cpython-d667d72cb75c41f3045d00945ee4652a8b814418.tar.bz2
Temporary silence test broken by issue19255.
Remove unused variables.
-rw-r--r--Lib/test/test_io.py3
-rw-r--r--Python/import.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 23edee6..4182da3 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2691,7 +2691,8 @@ class CTextIOWrapperTest(TextIOWrapperTest):
class PyTextIOWrapperTest(TextIOWrapperTest):
io = pyio
- shutdown_error = "LookupError: unknown encoding: ascii"
+ #shutdown_error = "LookupError: unknown encoding: ascii"
+ shutdown_error = "TypeError: 'NoneType' object is not iterable"
class IncrementalNewlineDecoderTest(unittest.TestCase):
diff --git a/Python/import.c b/Python/import.c
index 207dbce..7972f86 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -401,8 +401,6 @@ PyImport_Cleanup(void)
PyObject *key, *value, *dict;
PyInterpreterState *interp = PyThreadState_GET()->interp;
PyObject *modules = interp->modules;
- PyObject *builtins_mod = NULL;
- PyObject *sys_mod = NULL;
PyObject *weaklist = NULL;
char **p;