Use email instead of mimetools and rfc822

mimetools and rfc822 have been deprecated in python2 and were dropped from
python3, but email is available in both.

2 files changed, 6 insertions, 8 deletions

diff --git a/urlgrabber/byterange.py b/urlgrabber/byterange.py
index fadc9c0..6e79e89 100644
--- a/urlgrabber/byterange.py
+++ b/urlgrabber/byterange.py
@@ -22,7 +22,7 @@ import os
 import stat
 import urllib
 import urllib2
-import rfc822
+import email
 
 DEBUG = None
 
@@ -218,13 +218,12 @@ class FileRangeHandler(urllib2.FileHandler):
     """
     def open_local_file(self, req):
         import mimetypes
-        import mimetools
         host = req.get_host()
         file = req.get_selector()
         localfile = urllib.url2pathname(file)
         stats = os.stat(localfile)
         size = stats[stat.ST_SIZE]
-        modified = rfc822.formatdate(stats[stat.ST_MTIME])
+        modified = email.utils.formatdate(stats[stat.ST_MTIME])
         mtype = mimetypes.guess_type(file)[0]
         if host:
             host, port = urllib.splitport(host)
@@ -241,9 +240,9 @@ class FileRangeHandler(urllib2.FileHandler):
                 raise RangeError(9, 'Requested Range Not Satisfiable')
             size = (lb - fb)
             fo = RangeableFileObject(fo, (fb,lb))
-        headers = mimetools.Message(StringIO(
+        headers = email.message_from_string(
             'Content-Type: %s\nContent-Length: %d\nLast-modified: %s\n' %
-            (mtype or 'text/plain', size, modified)))
+            (mtype or 'text/plain', size, modified))
         return urllib.addinfourl(fo, headers, 'file:'+file)
 
 
@@ -260,7 +259,6 @@ import ftplib
 import socket
 import sys
 import mimetypes
-import mimetools
 
 class FTPRangeHandler(urllib2.FTPHandler):
     def ftp_open(self, req):
diff --git a/urlgrabber/grabber.py b/urlgrabber/grabber.py
index 649198b..1764c8c 100644
--- a/urlgrabber/grabber.py
+++ b/urlgrabber/grabber.py
@@ -525,7 +525,7 @@ import string
 import urllib
 import urllib2
 from httplib import responses
-import mimetools
+import email
 import thread
 import types
 import stat
@@ -1391,7 +1391,7 @@ class PyCurlFileObject(object):
         hdrfp = StringIO()
         hdrfp.write(self._hdr_dump[statusend:])
         hdrfp.seek(0)
-        self._parsed_hdr =  mimetools.Message(hdrfp)
+        self._parsed_hdr =  email.message_from_string(hdrfp)
         return self._parsed_hdr
 
     hdr = property(_return_hdr_obj)