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

[frank.wierzbicki]

http://hg.python.org/jython/rev/c5264be627c2
changeset:   6427:c5264be627c2
parent:      6425:5170073d6fbb
parent:      6426:2923c6c259f9
user:        Frank Wierzbicki <fwierzbicki at gmail.com>
date:        Mon Mar 19 21:42:24 2012 -0700
summary:
  Merge 2.5.

files:
  NEWS                    |  1 +
  grammar/PythonPartial.g |  3 ++-
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/NEWS b/NEWS
--- a/NEWS
+++ b/NEWS
@@ -5,6 +5,7 @@
 
 Jython 2.5.3b2
   Bugs Fixed
+    - [ 1749 ] function descriptor doesn't work in interactive console
     - [ 1721 ] NPE when using JSR 223 (TestCase+Patch)
     - [ 1536 ] NPE in org.python.jsr223.PyScriptEngine:187
     - [ 1829 ] test_socket.py failing on Ubuntu (Oneiric)
diff --git a/grammar/PythonPartial.g b/grammar/PythonPartial.g
--- a/grammar/PythonPartial.g
+++ b/grammar/PythonPartial.g
@@ -481,7 +481,8 @@
     | try_stmt
     | with_stmt
     | (decorators? DEF) => funcdef
-    | classdef
+    | (decorators? CLASS) => classdef
+    | decorators
     ;
 
 //if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]

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