Revert revisions 57472, 57474, and 57477 which disabled some tests

when the email package was removed.  Email was restored, so restore the tests.

Lib/test/test_pyclbr.py

@@ -175,7 +175,7 @@ class PyclbrTest(TestCase):
         cm('pydoc')
 
         # Tests for modules inside packages
-        #cm('email.parser')
+        cm('email.parser')
         cm('test.test_pyclbr')
 
 

Lib/test/test_zipfile.py

@@ -439,7 +439,6 @@ class PyZipFileTests(unittest.TestCase):
         zipfp.close()
 
     def testWritePythonPackage(self):
-        return  # XXX(nnorwitz): disable test until email is checked in again.
         import email
         packagedir = os.path.dirname(email.__file__)
 

Lib/urllib.py

@@ -403,7 +403,7 @@ class URLopener:
 
     def open_local_file(self, url):
         """Use local file."""
-        import mimetypes, mimetools #, email.utils
+        import mimetypes, mimetools, email.utils
         from io import StringIO
         host, file = splithost(url)
         localname = url2pathname(file)
@@ -412,17 +412,7 @@ class URLopener:
         except OSError as e:
             raise IOError(e.errno, e.strerror, e.filename)
         size = stats.st_size
-        # XXX(nnorwitz): inline formatdate until it is restored.
-        #modified = email.utils.formatdate(stats.st_mtime, usegmt=True)
-        now, zone = time.gmtime(stats.st_mtime), 'GMT'
-        modified = '%s, %02d %s %04d %02d:%02d:%02d %s' % (
-            ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'][now[6]],
-            now[2],
-            ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-             'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'][now[1] - 1],
-            now[0], now[3], now[4], now[5],
-            zone)
-
+        modified = email.utils.formatdate(stats.st_mtime, usegmt=True)
         mtype = mimetypes.guess_type(url)[0]
         headers = mimetools.Message(StringIO(
             'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' %

Lib/urllib2.py

@@ -1204,7 +1204,7 @@ class FileHandler(BaseHandler):
 
     # not entirely sure what the rules are here
     def open_local_file(self, req):
-        #import email.utils
+        import email.utils
         import mimetypes
         host = req.get_host()
         file = req.get_selector()
@@ -1212,17 +1212,7 @@ class FileHandler(BaseHandler):
         try:
             stats = os.stat(localfile)
             size = stats.st_size
-            #modified = email.utils.formatdate(stats.st_mtime, usegmt=True)
-            # XXX(nnorwitz): inline formatdate until it is restored.
-            now, zone = time.gmtime(stats.st_mtime), 'GMT'
-            modified = '%s, %02d %s %04d %02d:%02d:%02d %s' % (
-        ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'][now[6]],
-        now[2],
-        ['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
-         'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'][now[1] - 1],
-        now[0], now[3], now[4], now[5],
-        zone)
-
+            modified = email.utils.formatdate(stats.st_mtime, usegmt=True)
             mtype = mimetypes.guess_type(file)[0]
             headers = mimetools.Message(StringIO(
                 'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %