[Jython-checkins] SF.net SVN: jython:[5925] trunk/jython/src/org/python/modules/zipimport/ zipimporter.java

[<cg...@us...>]

Revision: 5925
          http://jython.svn.sourceforge.net/jython/?rev=5925&view=rev
Author:   cgroves
Date:     2009-01-13 22:10:24 +0000 (Tue, 13 Jan 2009)

Log Message:
-----------
Allow importation from bytecode in a zip file even if the source isn't present

Modified Paths:
--------------
    trunk/jython/src/org/python/modules/zipimport/zipimporter.java

Modified: trunk/jython/src/org/python/modules/zipimport/zipimporter.java
===================================================================
--- trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2009-01-13 02:36:27 UTC (rev 5924)
+++ trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2009-01-13 22:10:24 UTC (rev 5925)
@@ -315,7 +315,7 @@
         String sourcePath = path.substring(0, path.length() - 9) + ".py";
         PyObject sourceTocEntry = files.__finditem__(sourcePath);
         if (sourceTocEntry == null) {
-            return false;
+            return true;// If there is no source, assume the bytecode is ok
         }
         try {
             long bytecodeTime = dosTimeToEpoch(tocEntry.__finditem__(5).asInt(0),


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