Output try-except-finally statements where appropriate.

Demo/parser/test_unparse.py

@@ -80,7 +80,18 @@ class Foo: pass
     suite2
 """
 
-
+try_except_finally = """\
+try:
+    suite1
+except ex1:
+    suite2
+except ex2:
+    suite3
+else:
+    suite4
+finally:
+    suite5
+"""
 
 class ASTTestCase(unittest.TestCase):
     def assertASTEqual(self, ast1, ast2):
@@ -181,6 +192,9 @@ def test_elifs(self):
         self.check_roundtrip(elif1)
         self.check_roundtrip(elif2)
 
+    def test_try_except_finally(self):
+        self.check_roundtrip(try_except_finally)
+
 class DirectoryTestCase(ASTTestCase):
     """Test roundtrip behaviour on all files in Lib and Lib/test."""
 

Demo/parser/unparse.py

@@ -169,6 +169,10 @@ def _TryExcept(self, t):
             self.leave()
 
     def _TryFinally(self, t):
+        if len(t.body) == 1 and isinstance(t.body[0], ast.TryExcept):
+            # try-except-finally
+            self.dispatch(t.body)
+        else:
             self.fill("try")
             self.enter()
             self.dispatch(t.body)