[Python-checkins] cpython (3.4): Temporary silence test broken by issue19255.

larry.hastings python-checkins at python.org
Mon Mar 17 07:32:58 CET 2014


http://hg.python.org/cpython/rev/a0bc45a50e43
changeset:   89769:a0bc45a50e43
branch:      3.4
user:        Serhiy Storchaka <storchaka at gmail.com>
date:        Mon Feb 10 19:09:19 2014 +0200
summary:
  Temporary silence test broken by issue19255.
Remove unused variables.

files:
  Lib/test/test_io.py |  3 ++-
  Python/import.c     |  2 --
  2 files changed, 2 insertions(+), 3 deletions(-)


diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2691,7 +2691,8 @@
 
 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
--- a/Python/import.c
+++ b/Python/import.c
@@ -401,8 +401,6 @@
     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;
 

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list