From: Serhiy Storchaka <storchaka@gmail.com>
Date: Mon, 10 Feb 2014 17:09:19 +0000 (+0200)
Subject: Temporary silence test broken by issue19255.
X-Git-Tag: v3.4.0rc3~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0a976c09d379485380728be54d96b3213a10fa9;p=python

Temporary silence test broken by issue19255.
Remove unused variables.
---

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index 23edee69ed..4182da3aae 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 207dbced41..7972f8612f 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;