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

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

Revision: 5733
          http://jython.svn.sourceforge.net/jython/?rev=5733&view=rev
Author:   pjenvey
Date:     2008-12-11 00:10:25 +0000 (Thu, 11 Dec 2008)

Log Message:
-----------
fail fast when path exists but isn't a normal file
suggested by Ethan Glasser-Camp
fixes #1199

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	2008-12-10 08:23:53 UTC (rev 5732)
+++ trunk/jython/src/org/python/modules/zipimport/zipimporter.java	2008-12-11 00:10:25 UTC (rev 5733)
@@ -115,8 +115,10 @@
         prefix = "";
         while (true) {
             File fullPathFile = new File(sys.getPath(pathFile.getPath()));
-            if (fullPathFile.isFile()) {
-                archive = pathFile.getPath();
+            if (fullPathFile.exists()) {
+                if (fullPathFile.isFile()) {
+                    archive = pathFile.getPath();
+                }
                 break;
             }
 


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