[Jython-checkins] jython (merge 2.5 -> default): Merge from 2.5.

[frank.wierzbicki]

http://hg.python.org/jython/rev/8a8642e45433
changeset:   6246:8a8642e45433
parent:      6243:6792a9cea71d
parent:      6245:8831af94a9fc
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Sun Sep 04 16:39:47 2011 -0700
summary:
  Merge from 2.5.

files:
  ast/astview.py                           |  Bin 
  grammar/Python.g                         |    4 +---
  src/org/python/antlr/GrammarActions.java |    1 -
  3 files changed, 1 insertions(+), 4 deletions(-)


diff --git a/ast/astview.py b/ast/astview.py
old mode 100644
new mode 100755
diff --git a/grammar/Python.g b/grammar/Python.g
--- a/grammar/Python.g
+++ b/grammar/Python.g
@@ -1633,9 +1633,7 @@
           $etype = actions.castExpr($atom.tree);
           if ($t != null) {
               for(Object o : $t) {
-                  if ($etype instanceof Context) {
-                      ((Context)$etype).setContext(expr_contextType.Load);
-                  }
+                  actions.recurseSetContext($etype, expr_contextType.Load);
                   if (o instanceof Call) {
                       Call c = (Call)o;
                       c.setFunc((PyObject)$etype);
diff --git a/src/org/python/antlr/GrammarActions.java b/src/org/python/antlr/GrammarActions.java
--- a/src/org/python/antlr/GrammarActions.java
+++ b/src/org/python/antlr/GrammarActions.java
@@ -626,7 +626,6 @@
     }
 
     void checkDelete(expr e) {
-        //System.out.println("trying to del " + e);
         if (e instanceof Call) {
             errorHandler.error("can't delete function call", e);
         } else if (e instanceof Num) {

-- 
Repository URL: http://hg.python.org/jython