Merge remote-tracking branch 'paweljasinski/cp34389' into ipy-2.7-maint

IronLanguages · Sep 8, 2013 · 9674c81 · 9674c81
2 parents b359c52 + 90ff583
commit 9674c81
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/Languages/IronPython/IronPython/Modules/_ast.cs b/Languages/IronPython/IronPython/Modules/_ast.cs
@@ -293,9 +293,11 @@ internal static stmt Convert(Statement stmt) {
             internal static stmt Convert(TryStatement stmt) {
                 if (stmt.Finally != null) {
                     PythonList body;
-                    if (stmt.Handlers != null && stmt.Handlers.Count != 0)
-                        body = PythonOps.MakeListNoCopy(new TryExcept(stmt));
-                    else
+                    if (stmt.Handlers != null && stmt.Handlers.Count != 0) {
+                        stmt tryExcept = new TryExcept(stmt);
+                        tryExcept.GetSourceLocation(stmt);
+                        body = PythonOps.MakeListNoCopy(tryExcept);
+                    } else
                         body = ConvertStatements(stmt.Body);
 
                     return new TryFinally(body, ConvertStatements(stmt.Finally));