Get some more test_email/test_generator.py tests working

edschofield · edschofield · commit 05e87a3af90e · 2014-04-11T23:31:24.000+10:00
diff --git a/future/standard_library/email/message.py b/future/standard_library/email/message.py
@@ -16,6 +16,7 @@
 from io import BytesIO, StringIO
 
 # 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
@@ -132,14 +133,15 @@ def __init__(self, policy=compat32):
         # Default content type
         self._default_type = 'text/plain'
 
+    @as_native_str(encoding='utf-8')
     def __str__(self):
         """Return the entire formatted message as a string.
         This includes the headers, body, and envelope header.
         """
         return self.as_string()
 
     def as_string(self, unixfrom=False, maxheaderlen=0):
-        """Return the entire formatted message as a string.
+        """Return the entire formatted message as a (unicode) string.
         Optional `unixfrom' when True, means include the Unix From_ envelope
         header.
 
diff --git a/future/standard_library/test/test_email/test_generator.py b/future/standard_library/test/test_email/test_generator.py
@@ -7,6 +7,7 @@
 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.builtins import str
 
 
 @parameterize
diff --git a/libfuturize/fixes/fix_future_builtins.py b/libfuturize/fixes/fix_future_builtins.py
@@ -36,14 +36,16 @@ class FixFutureBuiltins(fixer_base.BaseFix):
     BM_compatible = True
     run_order = 9
 
+    # Currently we only match uses as a function. This doesn't match e.g.:
+    #     if isinstance(s, str):
+    #         ...
     PATTERN = """
               power<
                  ({0}) trailer< '(' args=[any] ')' >
               rest=any* >
               """.format(expression)
 
     def transform(self, node, results):
-        # import pdb; pdb.set_trace()
         name = results["name"]
         touch_import_top(u'future.builtins', name.value, node)
         # name.replace(Name(u"input", prefix=name.prefix))
