Mailman 3 May 2010 - Python-checkins

r80677 - in python/branches/py3k: Lib/test/test_urllibnet.py Lib/urllib/request.py
by senthil.kumaran 01 May '10

01 May '10

Author: senthil.kumaran Date: Sat May 1 10:29:18 2010 New Revision: 80677 Log: 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 ........ Modified: python/branches/py3k/ (props changed) python/branches/py3k/Lib/test/test_urllibnet.py python/branches/py3k/Lib/urllib/request.py Modified: python/branches/py3k/Lib/test/test_urllibnet.py ============================================================================== --- python/branches/py3k/Lib/test/test_urllibnet.py (original) +++ python/branches/py3k/Lib/test/test_urllibnet.py Sat May 1 10:29:18 2010 @@ -8,6 +8,7 @@ import sys import os import email.message +import time def _open_with_retry(func, host, *args, **kwargs): @@ -180,6 +181,16 @@ 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(): Modified: python/branches/py3k/Lib/urllib/request.py ============================================================================== --- python/branches/py3k/Lib/urllib/request.py (original) +++ python/branches/py3k/Lib/urllib/request.py Sat May 1 10:29:18 2010 @@ -1779,7 +1779,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':

1 0

r80676 - in python/branches/release26-maint: Lib/test/test_urllibnet.py Lib/urllib.py
by senthil.kumaran 01 May '10

01 May '10

Author: senthil.kumaran Date: Sat May 1 10:06:38 2010 New Revision: 80676 Log: 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 ........ Modified: python/branches/release26-maint/ (props changed) python/branches/release26-maint/Lib/test/test_urllibnet.py python/branches/release26-maint/Lib/urllib.py Modified: python/branches/release26-maint/Lib/test/test_urllibnet.py ============================================================================== --- python/branches/release26-maint/Lib/test/test_urllibnet.py (original) +++ python/branches/release26-maint/Lib/test/test_urllibnet.py Sat May 1 10:06:38 2010 @@ -8,6 +8,7 @@ import sys import os import mimetools +import time def _open_with_retry(func, host, *args, **kwargs): @@ -178,6 +179,16 @@ self.assert_(isinstance(header, mimetools.Message), "header is not an instance of mimetools.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.getheader('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(): Modified: python/branches/release26-maint/Lib/urllib.py ============================================================================== --- python/branches/release26-maint/Lib/urllib.py (original) +++ python/branches/release26-maint/Lib/urllib.py Sat May 1 10:06:38 2010 @@ -592,7 +592,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':

1 0

r80675 - in python/trunk/Lib: test/test_urllibnet.py urllib.py
by senthil.kumaran 01 May '10

01 May '10

Author: senthil.kumaran Date: Sat May 1 10:01:56 2010 New Revision: 80675 Log: Fix issue8582: urllib.urlretrieve fails with ValueError: Invalid format string Modified: python/trunk/Lib/test/test_urllibnet.py python/trunk/Lib/urllib.py Modified: python/trunk/Lib/test/test_urllibnet.py ============================================================================== --- python/trunk/Lib/test/test_urllibnet.py (original) +++ python/trunk/Lib/test/test_urllibnet.py Sat May 1 10:01:56 2010 @@ -7,6 +7,8 @@ import urllib import sys import os +import time + mimetools = test_support.import_module("mimetools", deprecated=True) @@ -178,6 +180,17 @@ self.assertIsInstance(header, mimetools.Message, "header is not an instance of mimetools.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.getheader('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(): Modified: python/trunk/Lib/urllib.py ============================================================================== --- python/trunk/Lib/urllib.py (original) +++ python/trunk/Lib/urllib.py Sat May 1 10:01:56 2010 @@ -588,7 +588,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':

1 0