From f992a2b11e5fdcddbb6ef834a0601e1ac6307409 Mon Sep 17 00:00:00 2001 From: Neal Norwitz Date: Sun, 11 Jun 2006 07:26:27 +0000 Subject: [PATCH] Fix errors found by pychecker --- Lib/pkgutil.py | 1 + Lib/wsgiref/validate.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index 26c797f0f67..1683fae379a 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -208,6 +208,7 @@ class ImpLoader: def _reopen(self): if self.file and self.file.closed: + mod_type = self.etc[2] if mod_type==imp.PY_SOURCE: self.file = open(self.filename, 'rU') elif mod_type in (imp.PY_COMPILED, imp.C_EXTENSION): diff --git a/Lib/wsgiref/validate.py b/Lib/wsgiref/validate.py index 934822b30fb..f7b1ae78429 100644 --- a/Lib/wsgiref/validate.py +++ b/Lib/wsgiref/validate.py @@ -248,7 +248,7 @@ class PartialIteratorWrapper: def __iter__(self): # We want to make sure __iter__ is called - return IteratorWrapper(self.iterator) + return IteratorWrapper(self.iterator, None) class IteratorWrapper: @@ -313,7 +313,7 @@ def check_environ(environ): continue assert type(environ[key]) is StringType, ( "Environmental variable %s is not a string: %r (value: %r)" - % (type(environ[key]), environ[key])) + % (key, type(environ[key]), environ[key])) assert type(environ['wsgi.version']) is TupleType, ( "wsgi.version should be a tuple (%r)" % environ['wsgi.version'])