Merge pull request #595 from abjonnes/fix-raise-bug

Fix bug in fix_raise.py fixer

Author: edschofield

src/libfuturize/fixes/fix_raise.py

@@ -94,7 +94,7 @@ def transform(self, node, results):
                 args = [exc, Comma(), val]
                 if tb is not None:
                     args += [Comma(), tb]
-                return Call(Name(u"raise_"), args)
+                return Call(Name(u"raise_"), args, prefix=node.prefix)
 
         if tb is not None:
             tb.prefix = ""

tests/test_future/test_libfuturize_fixers.py

@@ -767,6 +767,20 @@ def test_unknown_value_with_traceback_with_comments(self):
         raise_(E, Func(arg1, arg2, arg3), tb) # foo"""
         self.check(b, a)
 
+    def test_unknown_value_with_indent(self):
+        b = """
+        while True:
+            print()  # another expression in the same block triggers different parsing
+            raise E, V
+        """
+        a = """
+        from future.utils import raise_
+        while True:
+            print()  # another expression in the same block triggers different parsing
+            raise_(E, V)
+        """
+        self.check(b, a)
+
     # These should produce a warning
 
     def test_string_exc(self):