diff options
| author | Neal Norwitz <nnorwitz@gmail.com> | 2007-08-30 03:06:59 (GMT) |
|---|---|---|
| committer | Neal Norwitz <nnorwitz@gmail.com> | 2007-08-30 03:06:59 (GMT) |
| commit | 315d845739709e225a90b9089d3f980b9cfde7e6 (patch) | |
| tree | 6fdf54da4d95fca4ca1fa45e8ec46aebc2efb6a4 /Lib/urllib2.py | |
| parent | 8b3d659692b6d092991dc3b5b4042547f885fa8c (diff) | |
| download | cpython-315d845739709e225a90b9089d3f980b9cfde7e6.zip cpython-315d845739709e225a90b9089d3f980b9cfde7e6.tar.gz cpython-315d845739709e225a90b9089d3f980b9cfde7e6.tar.bz2 | |
Revert revisions 57472, 57474, and 57477 which disabled some tests
when the email package was removed. Email was restored, so restore the tests.
Diffstat (limited to 'Lib/urllib2.py')
| -rw-r--r-- | Lib/urllib2.py | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Lib/urllib2.py b/Lib/urllib2.py index 32fb205..72e2899 100644 --- a/Lib/urllib2.py +++ b/Lib/urllib2.py @@ -1204,7 +1204,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() @@ -1212,17 +1212,7 @@ class FileHandler(BaseHandler): try: stats = os.stat(localfile) size = stats.st_size - #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) - + modified = email.utils.formatdate(stats.st_mtime, usegmt=True) mtype = mimetypes.guess_type(file)[0] headers = mimetools.Message(StringIO( 'Content-type: %s\nContent-length: %d\nLast-modified: %s\n' % |