diff options
Diffstat (limited to 'Lib')
| -rw-r--r-- | Lib/urllib.py | 14 | ||||
| -rw-r--r-- | Lib/urllib2.py | 14 |
2 files changed, 24 insertions, 4 deletions
diff --git a/Lib/urllib.py b/Lib/urllib.py index 3ecfea7c..bbcd00e2 100644 --- a/Lib/urllib.py +++ b/Lib/urllib.py @@ -403,7 +403,7 @@ class URLopener: def open_local_file(self, url): """Use local file.""" - import mimetypes, mimetools, email.utils + import mimetypes, mimetools #, email.utils from io import StringIO host, file = splithost(url) localname = url2pathname(file) @@ -412,7 +412,17 @@ class URLopener: except OSError as e: raise IOError(e.errno, e.strerror, e.filename) 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] headers = mimetools.Message(StringIO( 'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' % diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 448f2a8..658bc3d 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -1201,7 +1201,7 @@ class FileHandler(BaseHandler): # not entirely sure what the rules are here def open_local_file(self, req): - import email.utils + #import email.utils import mimetypes host = req.get_host() file = req.get_selector() @@ -1209,7 +1209,17 @@ class FileHandler(BaseHandler): try: stats = os.stat(localfile) 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] headers = mimetools.Message(StringIO( 'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' % |