[Jython-checkins] SF.net SVN: jython:[6484] branches/jy26

[<fwi...@us...>]

Revision: 6484
          http://jython.svn.sourceforge.net/jython/?rev=6484&view=rev
Author:   fwierzbicki
Date:     2009-06-19 01:02:53 +0000 (Fri, 19 Jun 2009)

Log Message:
-----------
Point at 2.6 CPythonLib, fix with statement default.

Modified Paths:
--------------
    branches/jy26/src/org/python/compiler/CodeCompiler.java
    branches/jy26/src/org/python/compiler/Future.java

Property Changed:
----------------
    branches/jy26/


Property changes on: branches/jy26
___________________________________________________________________
Modified: svn:externals
   - CPythonLib -r70085 http://svn.python.org/projects/python/branches/release25-maint/Lib/

   + CPythonLib -r73469 http://svn.python.org/projects/python/branches/release26-maint/Lib/


Modified: branches/jy26/src/org/python/compiler/CodeCompiler.java
===================================================================
--- branches/jy26/src/org/python/compiler/CodeCompiler.java	2009-06-18 15:53:09 UTC (rev 6483)
+++ branches/jy26/src/org/python/compiler/CodeCompiler.java	2009-06-19 01:02:53 UTC (rev 6484)
@@ -2267,10 +2267,6 @@
 
     @Override
     public Object visitWith(With node) throws Exception {
-        if (!module.getFutures().withStatementSupported()) {
-            throw new ParseException("'with' will become a reserved keyword in Python 2.6", node);
-        }
-
         final Label label_body_start = new Label();
         final Label label_body_end = new Label();
         final Label label_catch = new Label();

Modified: branches/jy26/src/org/python/compiler/Future.java
===================================================================
--- branches/jy26/src/org/python/compiler/Future.java	2009-06-18 15:53:09 UTC (rev 6483)
+++ branches/jy26/src/org/python/compiler/Future.java	2009-06-19 01:02:53 UTC (rev 6484)
@@ -56,8 +56,6 @@
         if (cflags != null) {
             if (cflags.isFlagSet(CodeFlag.CO_FUTURE_DIVISION))
                 FutureFeature.division.addTo(features);
-            if (cflags.isFlagSet(CodeFlag.CO_FUTURE_WITH_STATEMENT))
-                FutureFeature.with_statement.addTo(features);
             if (cflags.isFlagSet(CodeFlag.CO_FUTURE_ABSOLUTE_IMPORT))
                 FutureFeature.absolute_import.addTo(features);
         }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.