[Python-checkins] r76871 - in sandbox/trunk/2to3/lib2to3: main.py tests/test_main.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Fri Dec 18 03:49:21 2009
New Revision: 76871

Log:
handle unencodable diffs gracefully #5093

Added:
   sandbox/trunk/2to3/lib2to3/tests/test_main.py
Modified:
   sandbox/trunk/2to3/lib2to3/main.py

Modified: sandbox/trunk/2to3/lib2to3/main.py
==============================================================================
--- sandbox/trunk/2to3/lib2to3/main.py	(original)
+++ sandbox/trunk/2to3/lib2to3/main.py	Fri Dec 18 03:49:21 2009
@@ -60,8 +60,14 @@
         else:
             self.log_message("Refactored %s", filename)
             if self.show_diffs:
-                for line in diff_texts(old, new, filename):
-                    print line
+                diff_lines = diff_texts(old, new, filename)
+                try:
+                    for line in diff_lines:
+                        print line
+                except UnicodeEncodeError:
+                    warn("couldn't encode %s's diff for your terminal" %
+                         (filename,))
+                    return
 
 
 def warn(msg):

Added: sandbox/trunk/2to3/lib2to3/tests/test_main.py
==============================================================================
--- (empty file)
+++ sandbox/trunk/2to3/lib2to3/tests/test_main.py	Fri Dec 18 03:49:21 2009
@@ -0,0 +1,36 @@
+# coding: utf-8
+import sys
+import codecs
+import StringIO
+import unittest
+
+from lib2to3 import main
+
+
+class TestMain(unittest.TestCase):
+
+    def run_2to3_capture(self, args, in_capture, out_capture, err_capture):
+        save_stdin = sys.stdin
+        save_stdout = sys.stdout
+        save_stderr = sys.stderr
+        sys.stdin = in_capture
+        sys.stdout = out_capture
+        sys.stderr = err_capture
+        try:
+            return main.main("lib2to3.fixes", args)
+        finally:
+            sys.stdin = save_stdin
+            sys.stdout = save_stdout
+            sys.stderr = save_stderr
+
+    def test_unencodable_diff(self):
+        input_stream = StringIO.StringIO(u"print 'nothing'\nprint u'über'\n")
+        out = StringIO.StringIO()
+        out_enc = codecs.getwriter("ascii")(out)
+        err = StringIO.StringIO()
+        ret = self.run_2to3_capture(["-"], input_stream, out_enc, err)
+        self.assertEqual(ret, 0)
+        output = out.getvalue()
+        self.assertTrue("-print 'nothing'" in output)
+        self.assertTrue("WARNING: couldn't encode <stdin>'s diff for "
+                        "your terminal" in err.getvalue())