Index: Lib/test/test_wsgiref.py
===================================================================
--- Lib/test/test_wsgiref.py	(revision 86572)
+++ Lib/test/test_wsgiref.py	(working copy)
@@ -1,4 +1,3 @@
-from __future__ import nested_scopes    # Backward compat for 2.1
 from unittest import TestCase
 from wsgiref.util import setup_testing_defaults
 from wsgiref.headers import Headers
@@ -28,7 +27,6 @@
         self.server_port = port
         self.setup_environ()
 
-
 class MockHandler(WSGIRequestHandler):
     """Non-socket HTTP handler"""
     def setup(self):
@@ -38,10 +36,6 @@
     def finish(self):
         pass
 
-
-
-
-
 def hello_app(environ,start_response):
     start_response("200 OK", [
         ('Content-Type','text/plain'),
@@ -63,28 +57,6 @@
 
     return out.getvalue(), err.getvalue()
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 def compare_generic_iter(make_it,match):
     """Utility to compare a generic 2.1/2.2+ iterator with an iterable
 
@@ -121,11 +93,6 @@
         else:
             raise AssertionError("Too many items from .__next__()", it)
 
-
-
-
-
-
 class IntegrationTests(TestCase):
 
     def check_hello(self, out, has_length=True):
@@ -369,14 +336,15 @@
 
     def testMappingInterface(self):
         test = [('x','y')]
-        self.assertEqual(len(Headers([])),0)
-        self.assertEqual(len(Headers(test[:])),1)
+        self.assertEqual(len(Headers()), 0)
+        self.assertEqual(len(Headers([])), 0)
+        self.assertEqual(len(Headers(test[:])), 1)
         self.assertEqual(Headers(test[:]).keys(), ['x'])
         self.assertEqual(Headers(test[:]).values(), ['y'])
         self.assertEqual(Headers(test[:]).items(), test)
         self.assertFalse(Headers(test).items() is test)  # must be copy!
 
-        h=Headers([])
+        h=Headers()
         del h['foo']   # should not raise an error
 
         h['Foo'] = 'bar'
@@ -401,9 +369,8 @@
     def testRequireList(self):
         self.assertRaises(TypeError, Headers, "foo")
 
-
     def testExtras(self):
-        h = Headers([])
+        h = Headers()
         self.assertEqual(str(h),'\r\n')
 
         h.add_header('foo','bar',baz="spam")
@@ -441,16 +408,6 @@
     def handle_error(self):
         raise   # for testing, we want to see what's happening
 
-
-
-
-
-
-
-
-
-
-
 class HandlerTests(TestCase):
 
     def checkEnvironAttrs(self, handler):
@@ -500,7 +457,6 @@
             self.assertRaises(NotImplementedError, getattr(h,name))
         self.assertRaises(NotImplementedError, h._write, "test")
 
-
     def testContentLength(self):
         # Demo one reason iteration is better than write()...  ;)
 
@@ -539,11 +495,6 @@
             b'\r\n'
             b'\xd1\x82\xd0\xb5\xd1\x81\xd1\x82')
 
-
-
-
-
-
     def testBasicErrorOutput(self):
 
         def non_error_app(e,s):
@@ -585,7 +536,6 @@
             "\r\n".encode("iso-8859-1")+MSG))
         self.assertIn("AssertionError", h.stderr.getvalue())
 
-
     def testHeaderFormats(self):
 
         def non_error_app(e,s):