summaryrefslogtreecommitdiffstats
path: root/Lib/urllib
diff options
context:
space:
mode:
authorSenthil Kumaran <orsenthil@gmail.com>2010-05-01 08:32:23 (GMT)
committerSenthil Kumaran <orsenthil@gmail.com>2010-05-01 08:32:23 (GMT)
commit5a3bc6533c80c17842554678dde469bca23f9501 (patch)
treef924e67ef745cde2cde1075b0dd308a11308cf29 /Lib/urllib
parenta751c3fcb85b91772485b87948ef45477d01a61a (diff)
downloadcpython-5a3bc6533c80c17842554678dde469bca23f9501.zip
cpython-5a3bc6533c80c17842554678dde469bca23f9501.tar.gz
cpython-5a3bc6533c80c17842554678dde469bca23f9501.tar.bz2
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 ........ ................
Diffstat (limited to 'Lib/urllib')
-rw-r--r--Lib/urllib/request.py2
1 files changed, 1 insertions, 1 deletions
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 @@ 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':