commit 5a3bc6533c80c17842554678dde469bca23f9501
author Senthil Kumaran <orsenthil@gmail.com> Sat May 01 08:32:23 2010 +0000
committer Senthil Kumaran <orsenthil@gmail.com> Sat May 01 08:32:23 2010 +0000
tree f924e67ef745cde2cde1075b0dd308a11308cf29
parent a751c3fcb85b91772485b87948ef45477d01a61a

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
  ........
................

Lib/urllib/request.py

diff --git a/Lib/urllib/request.py b/Lib/urllib/request.py
index 0f9e2f8..002e326 100644
--- a/Lib/urllib/request.py
+++ b/Lib/urllib/request.py
@@ -1781,7 +1781,7 @@
         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':