Silence warnings under -3 triggered by wsgiref.

diff --git a/Lib/wsgiref/handlers.py b/Lib/wsgiref/handlers.py
index 099371b079afc0cd8942161ee2fc283515f1c471..173e34c136e89c9c148bd8270d41dc339a616e9b 100644 (file)
--- a/Lib/wsgiref/handlers.py
+++ b/Lib/wsgiref/handlers.py
@@ -17,12 +17,13 @@ except NameError:
             d[k] = v
         return d
 
-try:
-    True
-    False
-except NameError:
-    True = not None
-    False = not True
+# Uncomment for 2.2 compatibility.
+#try:
+#    True
+#    False
+#except NameError:
+#    True = not None
+#    False = not True
 
 
 # Weekday and month names for HTTP date/time formatting; always English!

diff --git a/Lib/wsgiref/headers.py b/Lib/wsgiref/headers.py
index 016eb86f9ee30cd97f60cd3a1a22c881c0694950..3169acfb6b3c41822b031494493653c2efb483da 100644 (file)
--- a/Lib/wsgiref/headers.py
+++ b/Lib/wsgiref/headers.py
@@ -63,7 +63,7 @@ class Headers:
         Does *not* raise an exception if the header is missing.
         """
         name = name.lower()
-        self._headers[:] = [kv for kv in self._headers if kv[0].lower()<>name]
+        self._headers[:] = [kv for kv in self._headers if kv[0].lower() != name]
 
     def __getitem__(self,name):
         """Get the first header value for 'name'
@@ -142,7 +142,7 @@ class Headers:
         return self._headers[:]
 
     def __repr__(self):
-        return "Headers(%s)" % `self._headers`
+        return "Headers(%r)" % self._headers
 
     def __str__(self):
         """str() returns the formatted headers, complete with end line,

diff --git a/Lib/wsgiref/simple_server.py b/Lib/wsgiref/simple_server.py
index 95996cc2f3e1301079ab30172abd399a1d90f758..1b0a4b220980d51f8d24cfd81ad35ab0a22e7bcf 100644 (file)
--- a/Lib/wsgiref/simple_server.py
+++ b/Lib/wsgiref/simple_server.py
@@ -169,7 +169,7 @@ def demo_app(environ,start_response):
     print >>stdout
     h = environ.items(); h.sort()
     for k,v in h:
-        print >>stdout, k,'=',`v`
+        print >>stdout, k,'=', repr(v)
     start_response("200 OK", [('Content-Type','text/plain')])
     return [stdout.getvalue()]
 

diff --git a/Lib/wsgiref/util.py b/Lib/wsgiref/util.py
index 9009b876e8ef7329095c6051afbc5a7fafd8565b..450a32fbce5647fa142a23a7f4f1924abfed8cf1 100644 (file)
--- a/Lib/wsgiref/util.py
+++ b/Lib/wsgiref/util.py
@@ -98,7 +98,7 @@ def shift_path_info(environ):
         return None
 
     path_parts = path_info.split('/')
-    path_parts[1:-1] = [p for p in path_parts[1:-1] if p and p<>'.']
+    path_parts[1:-1] = [p for p in path_parts[1:-1] if p and p != '.']
     name = path_parts[1]
     del path_parts[1]
 
@@ -166,7 +166,7 @@ _hoppish = {
     'connection':1, 'keep-alive':1, 'proxy-authenticate':1,
     'proxy-authorization':1, 'te':1, 'trailers':1, 'transfer-encoding':1,
     'upgrade':1
-}.has_key
+}.__contains__
 
 def is_hop_by_hop(header_name):
     """Return true if 'header_name' is an HTTP/1.1 "Hop-by-Hop" header"""