[Jython-checkins] SF.net SVN: jython:[5598] trunk/jython/src/org/python/core/Py.java

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

Revision: 5598
          http://jython.svn.sourceforge.net/jython/?rev=5598&view=rev
Author:   fwierzbicki
Date:     2008-11-22 19:18:53 +0000 (Sat, 22 Nov 2008)

Log Message:
-----------
Fixes bug http://bugs.jython.org/issue1174 which reveals a corner case where
CompilerFlags can come out as null.  Not positive that we should be passing
the "flags" value down when there is no frame, but this is probably right. Put
an XXX in so it can be looked at again later.

Modified Paths:
--------------
    trunk/jython/src/org/python/core/Py.java

Modified: trunk/jython/src/org/python/core/Py.java
===================================================================
--- trunk/jython/src/org/python/core/Py.java	2008-11-21 14:59:28 UTC (rev 5597)
+++ trunk/jython/src/org/python/core/Py.java	2008-11-22 19:18:53 UTC (rev 5598)
@@ -1674,6 +1674,9 @@
             PyFrame frame = Py.getFrame();
             if (frame != null && frame.f_code != null) {
                 cflags = new CompilerFlags(frame.f_code.co_flags | flags);
+            } else {
+                //XXX: should this really pass flags or not?
+                cflags = new CompilerFlags(flags);
             }
         }
         return cflags;


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