mirror of https://github.com/python/cpython
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 ........
This commit is contained in:
parent
043bad00bc
commit
f6c456d323
|
@ -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.assertIsInstance(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():
|
||||
|
|
|
@ -1779,7 +1779,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':
|
||||
|
|
Loading…
Reference in New Issue