Change lots of uses of future.standard_library to future.backports

Author: edschofield

future/backports/email/__init__.py

@@ -50,29 +50,29 @@ def message_from_string(s, *args, **kws):
 
     Optional _class and strict are passed to the Parser constructor.
     """
-    from future.standard_library.email.parser import Parser
+    from future.backports.email.parser import Parser
     return Parser(*args, **kws).parsestr(s)
 
 def message_from_bytes(s, *args, **kws):
     """Parse a bytes string into a Message object model.
 
     Optional _class and strict are passed to the Parser constructor.
     """
-    from future.standard_library.email.parser import BytesParser
+    from future.backports.email.parser import BytesParser
     return BytesParser(*args, **kws).parsebytes(s)
 
 def message_from_file(fp, *args, **kws):
     """Read a file and parse its contents into a Message object model.
 
     Optional _class and strict are passed to the Parser constructor.
     """
-    from future.standard_library.email.parser import Parser
+    from future.backports.email.parser import Parser
     return Parser(*args, **kws).parse(fp)
 
 def message_from_binary_file(fp, *args, **kws):
     """Read a binary file and parse its contents into a Message object model.
 
     Optional _class and strict are passed to the Parser constructor.
     """
-    from future.standard_library.email.parser import BytesParser
+    from future.backports.email.parser import BytesParser
     return BytesParser(*args, **kws).parse(fp)

future/backports/email/_encoded_words.py

@@ -51,7 +51,7 @@
 import binascii
 import functools
 from string import ascii_letters, digits
-from future.standard_library.email import errors
+from future.backports.email import errors
 
 __all__ = ['decode_q',
            'encode_q',

future/backports/email/_header_value_parser.py

@@ -75,10 +75,10 @@
 import re
 from collections import namedtuple, OrderedDict
 
-from future.standard_library.urllib.parse import (unquote, unquote_to_bytes)
-from future.standard_library.email import _encoded_words as _ew
-from future.standard_library.email import errors
-from future.standard_library.email import utils
+from future.backports.urllib.parse import (unquote, unquote_to_bytes)
+from future.backports.email import _encoded_words as _ew
+from future.backports.email import errors
+from future.backports.email import utils
 
 #
 # Useful constants and functions

future/backports/email/_policybase.py

@@ -11,9 +11,9 @@
 from future.utils import with_metaclass
 
 import abc
-from future.standard_library.email import header
-from future.standard_library.email import charset as _charset
-from future.standard_library.email.utils import _has_surrogates
+from future.backports.email import header
+from future.backports.email import charset as _charset
+from future.backports.email.utils import _has_surrogates
 
 __all__ = [
     'Policy',

future/backports/email/charset.py

@@ -17,9 +17,9 @@
 
 from functools import partial
 
-from future.standard_library import email
-from future.standard_library.email import errors
-from future.standard_library.email.encoders import encode_7or8bit
+from future.backports import email
+from future.backports.email import errors
+from future.backports.email.encoders import encode_7or8bit
 
 
 # Flags for types of header encodings

future/backports/email/feedparser.py

@@ -28,9 +28,9 @@
 
 import re
 
-from future.standard_library.email import errors
-from future.standard_library.email import message
-from future.standard_library.email._policybase import compat32
+from future.backports.email import errors
+from future.backports.email import message
+from future.backports.email._policybase import compat32
 
 NLCRE = re.compile('\r\n|\r|\n')
 NLCRE_bol = re.compile('(\r\n|\r|\n)')

future/backports/email/generator.py

@@ -19,10 +19,10 @@
 import warnings
 
 from io import StringIO, BytesIO
-from future.standard_library.email._policybase import compat32
-from future.standard_library.email.header import Header
-from future.standard_library.email.utils import _has_surrogates
-import future.standard_library.email.charset as _charset
+from future.backports.email._policybase import compat32
+from future.backports.email.header import Header
+from future.backports.email.utils import _has_surrogates
+import future.backports.email.charset as _charset
 
 UNDERSCORE = '_'
 NL = '\n'  # XXX: no longer used by the code below.

future/backports/email/header.py

@@ -17,13 +17,13 @@
 import re
 import binascii
 
-from future.standard_library import email
-from future.standard_library.email import base64mime
-from future.standard_library.email.errors import HeaderParseError
-import future.standard_library.email.charset as _charset
+from future.backports import email
+from future.backports.email import base64mime
+from future.backports.email.errors import HeaderParseError
+import future.backports.email.charset as _charset
 
 # Helpers
-from future.standard_library.email.quoprimime import _max_append, header_decode
+from future.backports.email.quoprimime import _max_append, header_decode
 
 Charset = _charset.Charset
 

future/backports/email/headerregistry.py

@@ -14,9 +14,9 @@
 from future.builtins import super
 from future.builtins import str
 from future.utils import text_to_native_str
-from future.standard_library.email import utils
-from future.standard_library.email import errors
-from future.standard_library.email import _header_value_parser as parser
+from future.backports.email import utils
+from future.backports.email import errors
+from future.backports.email import _header_value_parser as parser
 
 class Address(object):
 

future/backports/email/message.py

@@ -17,11 +17,11 @@
 
 # Intrapackage imports
 from future.utils import as_native_str
-from future.standard_library.email import utils
-from future.standard_library.email import errors
-from future.standard_library.email._policybase import compat32
-from future.standard_library.email import charset as _charset
-from future.standard_library.email._encoded_words import decode_b
+from future.backports.email import utils
+from future.backports.email import errors
+from future.backports.email._policybase import compat32
+from future.backports.email import charset as _charset
+from future.backports.email._encoded_words import decode_b
 Charset = _charset.Charset
 
 SEMISPACE = '; '
@@ -149,7 +149,7 @@ def as_string(self, unixfrom=False, maxheaderlen=0):
         as you intend.  For more flexibility, use the flatten() method of a
         Generator instance.
         """
-        from future.standard_library.email.generator import Generator
+        from future.backports.email.generator import Generator
         fp = StringIO()
         g = Generator(fp, mangle_from_=False, maxheaderlen=maxheaderlen)
         g.flatten(self, unixfrom=unixfrom)
@@ -879,4 +879,4 @@ def get_charsets(self, failobj=None):
         return [part.get_content_charset(failobj) for part in self.walk()]
 
     # I.e. def walk(self): ...
-    from future.standard_library.email.iterators import walk
+    from future.backports.email.iterators import walk