Import email tests from their new home

edschofield · edschofield · commit b9a0c891e8c9 · 2014-04-12T14:55:14.000+10:00
diff --git a/future/tests/test_email/__init__.py b/future/tests/test_email/__init__.py
@@ -15,7 +15,7 @@
 from future.standard_library import email
 from future.standard_library.email.message import Message
 from future.standard_library.email._policybase import compat32
-from future.standard_library.test.test_email import __file__ as landmark
+from future.tests.test_email import __file__ as landmark
 
 # Run all tests in package for '-m unittest test.test_email'
 def load_tests(loader, standard_tests, pattern):
diff --git a/future/tests/test_email/test__encoded_words.py b/future/tests/test_email/test__encoded_words.py
@@ -4,7 +4,7 @@
 from future import standard_library
 from future.standard_library.email import _encoded_words as _ew
 from future.standard_library.email import errors
-from future.standard_library.test.test_email import TestEmailBase
+from future.tests.test_email import TestEmailBase
 from future.tests.base import unittest
 
 
diff --git a/future/tests/test_email/test_asian_codecs.py b/future/tests/test_email/test_asian_codecs.py
@@ -6,12 +6,12 @@
 from future.builtins import str
 from future import standard_library
 
-import unittest
 from future.standard_library.test.support import run_unittest
-from future.standard_library.test.test_email.test_email import TestEmailBase
 from future.standard_library.email.charset import Charset
 from future.standard_library.email.header import Header, decode_header
 from future.standard_library.email.message import Message
+from future.tests.base import unittest
+from future.tests.test_email.test_email import TestEmailBase
 
 # We're compatible with Python 2.3, but it doesn't have the built-in Asian
 # codecs, so we have to skip all these tests.
diff --git a/future/tests/test_email/test_generator.py b/future/tests/test_email/test_generator.py
@@ -2,11 +2,11 @@
 from __future__ import absolute_import, division, unicode_literals
 import io
 import textwrap
-import unittest
+from future.tests.base import unittest
 from future.standard_library.email import message_from_string, message_from_bytes
 from future.standard_library.email.generator import Generator, BytesGenerator
 from future.standard_library.email import policy
-from future.standard_library.test.test_email import TestEmailBase, parameterize
+from future.tests.test_email import TestEmailBase, parameterize
 from future.builtins import str
 
 
diff --git a/setup.py b/setup.py
@@ -25,7 +25,6 @@
             "future.standard_library.html",
             "future.standard_library.http",
             "future.standard_library.test",
-            "future.standard_library.test.test_email",
             "future.standard_library.urllib",
             "future.standard_library.xmlrpc",
             "future.moves.html",
@@ -34,6 +33,7 @@
             "future.moves.urllib",
             "future.moves.xmlrpc",
             "future.tests",
+            "future.tests.test_email",
             "future.utils",
             "past",
             "past.builtins",
