summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNeal Norwitz <nnorwitz@gmail.com>2006-06-11 07:26:27 (GMT)
committerNeal Norwitz <nnorwitz@gmail.com>2006-06-11 07:26:27 (GMT)
commitf992a2b11e5fdcddbb6ef834a0601e1ac6307409 (patch)
tree43fa3adc4d9ca3e9f51603c1dfb9e53b9803a165
parent7d5b6e8991fc397492f735a6e9d5e073e54ab15e (diff)
downloadcpython-f992a2b11e5fdcddbb6ef834a0601e1ac6307409.zip
cpython-f992a2b11e5fdcddbb6ef834a0601e1ac6307409.tar.gz
cpython-f992a2b11e5fdcddbb6ef834a0601e1ac6307409.tar.bz2
Fix errors found by pychecker
-rw-r--r--Lib/pkgutil.py1
-rw-r--r--Lib/wsgiref/validate.py4
2 files changed, 3 insertions, 2 deletions
diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py
index 26c797f..1683fae 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 934822b..f7b1ae7 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'])