From: Thomas Wouters <thomas@python.org>
Date: Fri, 3 Mar 2006 18:11:37 +0000 (+0000)
Subject: Update for absolute/relative imports and ifelse-expressions.
X-Git-Tag: v2.5a0~385
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=7e2ac2533eb7279ccff193f8cffe94abd1dfa83f;p=python

Update for absolute/relative imports and ifelse-expressions.
---

diff --git a/Tools/compiler/ast.txt b/Tools/compiler/ast.txt
index aeefc9869c..7968a52228 100644
--- a/Tools/compiler/ast.txt
+++ b/Tools/compiler/ast.txt
@@ -22,8 +22,9 @@ For: assign, list, body, else_&
 While: test, body, else_&
 With: expr, vars&, body
 If: tests!, else_&
+IfExp: test, then, else_
 Exec: expr, locals&, globals&
-From: modname*, names*
+From: modname*, names*, level*
 Import: names*
 Raise: expr1&, expr2&, expr3&
 TryFinally: body, final