mirror of
https://github.com/python/cpython.git
synced 2025-08-04 08:59:19 +00:00
Add content-type header to ftp URLs (SF patch #454553)
Modify rfc822.formatdate() to always generate English names, regardless of locale. This is required by RFC 1123. In open_local_file() of urllib and urllib2, use new formatdate() from rfc822.
This commit is contained in:
parent
53da317801
commit
6d8c1aabff
3 changed files with 27 additions and 14 deletions
|
@ -953,11 +953,21 @@ def formatdate(timeval=None):
|
|||
"""Returns time format preferred for Internet standards.
|
||||
|
||||
Sun, 06 Nov 1994 08:49:37 GMT ; RFC 822, updated by RFC 1123
|
||||
|
||||
According to RFC 1123, day and month names must always be in
|
||||
English. If not for that, this code could use strftime(). It
|
||||
can't because strftime() honors the locale and could generated
|
||||
non-English names.
|
||||
"""
|
||||
if timeval is None:
|
||||
timeval = time.time()
|
||||
return "%s" % time.strftime('%a, %d %b %Y %H:%M:%S GMT',
|
||||
time.gmtime(timeval))
|
||||
timeval = time.gmtime(timeval)
|
||||
return "%s, %02d %s %04d %02d:%02d:%02d GMT" % (
|
||||
["Mon", "Tue", "Wed", "Thu", "Fri", "Sat", "Sun"][timeval[6]],
|
||||
timeval[2],
|
||||
["Jan", "Feb", "Mar", "Apr", "May", "Jun",
|
||||
"Jul", "Aug", "Sep", "Oct", "Nov", "Dec"][timeval[1]-1],
|
||||
timeval[0], timeval[3], timeval[4], timeval[5])
|
||||
|
||||
|
||||
# When used as script, run a small test program.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue