Merged revisions 80677 via svnmerge from

svn+ssh://pythondev@svn.python.org/python/branches/py3k

................
  r80677 | senthil.kumaran | 2010-05-01 13:59:18 +0530 (Sat, 01 May 2010) | 9 lines

  Merged revisions 80675 via svnmerge from
  svn+ssh://pythondev@svn.python.org/python/trunk

  ........
    r80675 | senthil.kumaran | 2010-05-01 13:31:56 +0530 (Sat, 01 May 2010) | 3 lines

    Fix issue8582: urllib.urlretrieve fails with ValueError: Invalid format string
  ........
................

diff --git a/Lib/test/test_urllibnet.py b/Lib/test/test_urllibnet.py
index 63e061a9afbd4b6002dbd766697a5bf9683997cb..37cad422ed9601b5bca22d7296555ce1d7e49b4a 100644 (file)
--- a/Lib/test/test_urllibnet.py
+++ b/Lib/test/test_urllibnet.py
@@ -8,6 +8,7 @@ import urllib.request
 import sys
 import os
 import email.message
+import time
 
 
 def _open_with_retry(func, host, *args, **kwargs):
@@ -180,6 +181,16 @@ class urlretrieveNetworkTests(unittest.TestCase):
         self.assertTrue(isinstance(header, email.message.Message),
                      "header is not an instance of email.message.Message")
 
+    def test_data_header(self):
+        logo = "http://www.python.org/community/logos/python-logo-master-v3-TM.png"
+        file_location, fileheaders = self.urlretrieve(logo)
+        os.unlink(file_location)
+        datevalue = fileheaders.get('Date')
+        dateformat = '%a, %d %b %Y %H:%M:%S GMT'
+        try:
+            time.strptime(datevalue, dateformat)
+        except ValueError:
+            self.fail('Date value not in %r format', dateformat)
 
 
 def test_main():

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 0f9e2f8191423b3465a48632ba11b35702b8b5f3..002e3261f71e29db19eaa878465348d4d0a9edfe 100644 (file)
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1781,7 +1781,7 @@ class URLopener:
         else:
             encoding = ''
         msg = []
-        msg.append('Date: %s'%time.strftime('%a, %d %b %Y %T GMT',
+        msg.append('Date: %s'%time.strftime('%a, %d %b %Y %H:%M:%S GMT',
                                             time.gmtime(time.time())))
         msg.append('Content-type: %s' % type)
         if encoding == 'base64':