tidy up tryexcept and tryfinally nodes

diff --git a/Lib/compiler/ast.py b/Lib/compiler/ast.py
index c70da76e1b1c2dee218ca1af4a315cc0ed4f4ab1..7a7a6549c7034360c3e91f3cbc17d18763cd816a 100644 (file)
--- a/Lib/compiler/ast.py
+++ b/Lib/compiler/ast.py
@@ -222,28 +222,34 @@ class Raise(Node):
   def __repr__(self):
     return "Raise(%s,%s,%s)" % self._children[1:]
 
-class Tryfinally(Node):
-  nodes['tryfinally'] = 'Tryfinally'
+class TryFinally(Node):
+  nodes['tryfinally'] = 'TryFinally'
 
-  def __init__(self, try_, fin):
-    self.try_ = try_
-    self.fin = fin
-    self._children = ('tryfinally', try_, fin)
+  def __init__(self, body, final):
+    self.body = body
+    self.final = final
+    self._children = ('tryfinally', body, final)
 
   def __repr__(self):
-    return "Tryfinally(%s,%s)" % self._children[1:]
+    return "TryFinally(%s,%s)" % self._children[1:]
+
+class TryExcept(Node):
+  """Try/Except body and handlers
 
-class Tryexcept(Node):
-  nodes['tryexcept'] = 'Tryexcept'
+  The handlers attribute is a sequence of tuples.  The elements of the
+  tuple are the exception name, the name to bind the exception to, and
+  the body of the except clause.
+  """
+  nodes['tryexcept'] = 'TryExcept'
 
-  def __init__(self, try_, excs, else_):
-    self.try_ = try_
-    self.excs = excs
+  def __init__(self, body, handlers, else_):
+    self.body = body
+    self.handlers = handlers
     self.else_ = else_
-    self._children = ('tryexcept', try_, excs, else_)
+    self._children = ('tryexcept', body, handlers, else_)
 
   def __repr__(self):
-    return "Tryexcept(%s,%s,%s)" % self._children[1:]
+    return "TryExcept(%s,%s,%s)" % self._children[1:]
 
 class Return(Node):
   nodes['return'] = 'Return'

diff --git a/Tools/compiler/compiler/ast.py b/Tools/compiler/compiler/ast.py
index c70da76e1b1c2dee218ca1af4a315cc0ed4f4ab1..7a7a6549c7034360c3e91f3cbc17d18763cd816a 100644 (file)
--- a/Tools/compiler/compiler/ast.py
+++ b/Tools/compiler/compiler/ast.py
@@ -222,28 +222,34 @@ class Raise(Node):
   def __repr__(self):
     return "Raise(%s,%s,%s)" % self._children[1:]
 
-class Tryfinally(Node):
-  nodes['tryfinally'] = 'Tryfinally'
+class TryFinally(Node):
+  nodes['tryfinally'] = 'TryFinally'
 
-  def __init__(self, try_, fin):
-    self.try_ = try_
-    self.fin = fin
-    self._children = ('tryfinally', try_, fin)
+  def __init__(self, body, final):
+    self.body = body
+    self.final = final
+    self._children = ('tryfinally', body, final)
 
   def __repr__(self):
-    return "Tryfinally(%s,%s)" % self._children[1:]
+    return "TryFinally(%s,%s)" % self._children[1:]
+
+class TryExcept(Node):
+  """Try/Except body and handlers
 
-class Tryexcept(Node):
-  nodes['tryexcept'] = 'Tryexcept'
+  The handlers attribute is a sequence of tuples.  The elements of the
+  tuple are the exception name, the name to bind the exception to, and
+  the body of the except clause.
+  """
+  nodes['tryexcept'] = 'TryExcept'
 
-  def __init__(self, try_, excs, else_):
-    self.try_ = try_
-    self.excs = excs
+  def __init__(self, body, handlers, else_):
+    self.body = body
+    self.handlers = handlers
     self.else_ = else_
-    self._children = ('tryexcept', try_, excs, else_)
+    self._children = ('tryexcept', body, handlers, else_)
 
   def __repr__(self):
-    return "Tryexcept(%s,%s,%s)" % self._children[1:]
+    return "TryExcept(%s,%s,%s)" % self._children[1:]
 
 class Return(Node):
   nodes['return'] = 'Return'