PY3: fix xmlrpclib and email imports

scrapy/http/request/rpc.py

@@ -4,7 +4,7 @@ This module implements the XmlRpcRequest class which is a more convenient class
 
 See documentation in docs/topics/request-response.rst
 """
-import xmlrpclib
+from six.moves import xmlrpc_client as xmlrpclib
 
 from scrapy.http.request import Request
 from scrapy.utils.python import get_func_args

scrapy/mail.py

@@ -4,12 +4,21 @@ Mail sending helpers
 See documentation in docs/topics/email.rst
 """
 from cStringIO import StringIO
-from email.MIMEMultipart import MIMEMultipart
-from email.MIMENonMultipart import MIMENonMultipart
-from email.MIMEBase import MIMEBase
-from email.MIMEText import MIMEText
-from email.Utils import COMMASPACE, formatdate
-from email import Encoders
+import six
+
+from email.utils import COMMASPACE, formatdate
+if six.PY2:
+    from email.MIMEMultipart import MIMEMultipart
+    from email.MIMENonMultipart import MIMENonMultipart
+    from email.MIMEBase import MIMEBase
+    from email.MIMEText import MIMEText
+    from email import Encoders
+else:
+    from email.mime.multipart import MIMEMultipart
+    from email.mime.nonmultipart import MIMENonMultipart
+    from email.mime.base import MIMEBase
+    from email.mime.text import MIMEText
+    from email import encoders as Encoders
 
 from twisted.internet import defer, reactor, ssl
 from twisted.mail.smtp import ESMTPSenderFactory

scrapy/tests/test_http_request.py

@@ -1,6 +1,6 @@
 import cgi
 import unittest
-import xmlrpclib
+from six.moves import xmlrpc_client as xmlrpclib
 from six.moves.urllib.parse import urlparse
 
 from scrapy.http import Request, FormRequest, XmlRpcRequest, Headers, HtmlResponse