traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Get the urllib tests to pass without the email package

This commit is contained in:
Neal Norwitz 2007-08-25 19:00:31 +00:00
parent 0337ef62fa
commit fce59bf72a
2 changed files with 24 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Lib/urllib.py
View File

@ -403,7 +403,7 @@ class URLopener:
def open_local_file(self, url): def open_local_file(self, url):
"""Use local file.""" """Use local file."""
import mimetypes, mimetools, email.utils import mimetypes, mimetools #, email.utils
from io import StringIO from io import StringIO
host, file = splithost(url) host, file = splithost(url)
localname = url2pathname(file) localname = url2pathname(file)
@ -412,7 +412,17 @@ class URLopener:
except OSError as e: except OSError as e:
raise IOError(e.errno, e.strerror, e.filename) raise IOError(e.errno, e.strerror, e.filename)
size = stats.st_size size = stats.st_size
modified = email.utils.formatdate(stats.st_mtime, usegmt=True) # XXX(nnorwitz): inline formatdate until it is restored.
#modified = email.utils.formatdate(stats.st_mtime, usegmt=True)
now, zone = time.gmtime(stats.st_mtime), 'GMT'
modified = '%s, %02d %s %04d %02d:%02d:%02d %s' % (
['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'][now[6]],
now[2],
['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'][now[1] - 1],
now[0], now[3], now[4], now[5],
zone)
mtype = mimetypes.guess_type(url)[0] mtype = mimetypes.guess_type(url)[0]
headers = mimetools.Message(StringIO( headers = mimetools.Message(StringIO(
'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' % 'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' %

14
Lib/urllib2.py
View File

@ -1201,7 +1201,7 @@ class FileHandler(BaseHandler):
# not entirely sure what the rules are here # not entirely sure what the rules are here
def open_local_file(self, req): def open_local_file(self, req):
import email.utils #import email.utils
import mimetypes import mimetypes
host = req.get_host() host = req.get_host()
file = req.get_selector() file = req.get_selector()
@ -1209,7 +1209,17 @@ class FileHandler(BaseHandler):
try: try:
stats = os.stat(localfile) stats = os.stat(localfile)
size = stats.st_size size = stats.st_size
modified = email.utils.formatdate(stats.st_mtime, usegmt=True) #modified = email.utils.formatdate(stats.st_mtime, usegmt=True)
# XXX(nnorwitz): inline formatdate until it is restored.
now, zone = time.gmtime(stats.st_mtime), 'GMT'
modified = '%s, %02d %s %04d %02d:%02d:%02d %s' % (
['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'][now[6]],
now[2],
['Jan', 'Feb', 'Mar', 'Apr', 'May', 'Jun',
'Jul', 'Aug', 'Sep', 'Oct', 'Nov', 'Dec'][now[1] - 1],
now[0], now[3], now[4], now[5],
zone)
mtype = mimetypes.guess_type(file)[0] mtype = mimetypes.guess_type(file)[0]
headers = mimetools.Message(StringIO( headers = mimetools.Message(StringIO(
'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' % 'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' %