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)
commite0a976c09d379485380728be54d96b3213a10fa9 (patch)
treeccf5f5540864a82616c85dcaed45fedabe8b1de6
parent013bb91aa304062bb65fe8951e2d263f2065ee56 (diff)
downloadcpython-e0a976c09d379485380728be54d96b3213a10fa9.zip
cpython-e0a976c09d379485380728be54d96b3213a10fa9.tar.gz
cpython-e0a976c09d379485380728be54d96b3213a10fa9.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;