[Jython-checkins] SF.net SVN: jython: [4876] branches/asm/src/org/python

[<pj...@us...>]

Revision: 4876
          http://jython.svn.sourceforge.net/jython/?rev=4876&view=rev
Author:   pjenvey
Date:     2008-07-08 12:55:47 -0700 (Tue, 08 Jul 2008)

Log Message:
-----------
always re-generating byte code is more trouble than it's worth right now
(breaks the imp module)

Modified Paths:
--------------
    branches/asm/src/org/python/core/imp.java
    branches/asm/src/org/python/modules/zipimport/zipimporter.java

Modified: branches/asm/src/org/python/core/imp.java
===================================================================
--- branches/asm/src/org/python/core/imp.java	2008-07-08 10:02:23 UTC (rev 4875)
+++ branches/asm/src/org/python/core/imp.java	2008-07-08 19:55:47 UTC (rev 4876)
@@ -127,11 +127,7 @@
             }
         }
         */
-        // XXX: always re-generate byte code until APIVersion is fixed. Note that
-        // zipimporter.isOutdatedBytecode is also disabled so that all zipimported
-        // bytecode is also always re-generated
-        //return data;
-        return null;
+        return data;
     }
     
     public static byte[] compileSource(String name, File file, String sourceFilename,

Modified: branches/asm/src/org/python/modules/zipimport/zipimporter.java
===================================================================
--- branches/asm/src/org/python/modules/zipimport/zipimporter.java	2008-07-08 10:02:23 UTC (rev 4875)
+++ branches/asm/src/org/python/modules/zipimport/zipimporter.java	2008-07-08 19:55:47 UTC (rev 4876)
@@ -437,9 +437,6 @@
      * @return boolean whether or not the byte code is older
      */
     private boolean isOutdatedBytecode(String path, PyObject tocEntry) {
-        // XXX: Always recompile bytecode until bytecode APIVersion is fixed
-        return true;
-        /*
         String sourcePath = path.substring(0, path.length() - 9) + ".py";
         PyObject sourceTocEntry = files.__finditem__(sourcePath);
         if (sourceTocEntry == null) {
@@ -455,7 +452,6 @@
         catch (PyObject.ConversionException ce) {
             return false;
         }
-        */
     }
 
     /**


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