[Jython-checkins] SF.net SVN: jython: [3115] branches/2.3/src/org/python/core

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

Revision: 3115
          http://svn.sourceforge.net/jython/?rev=3115&view=rev
Author:   cgroves
Date:     2007-02-21 21:23:37 -0800 (Wed, 21 Feb 2007)

Log Message:
-----------
merged r3021,3022 from trunk

Modified Paths:
--------------
    branches/2.3/src/org/python/core/PyStringMap.java
    branches/2.3/src/org/python/core/ZipFileImporter.java

Modified: branches/2.3/src/org/python/core/PyStringMap.java
===================================================================
--- branches/2.3/src/org/python/core/PyStringMap.java	2007-02-22 05:21:12 UTC (rev 3114)
+++ branches/2.3/src/org/python/core/PyStringMap.java	2007-02-22 05:23:37 UTC (rev 3115)
@@ -560,13 +560,27 @@
         }
         return l;
     }
-
+    
     /**
      * return an iterator over (key, value) pairs
      */
     public synchronized PyObject iteritems() {
         return new PyStringMapIter(keys, values, PyStringMapIter.ITEMS);
     }
+    
+    /**
+     * return an iterator over the keys
+     */
+    public synchronized PyObject iterkeys() {
+        return new PyStringMapIter(keys, values, PyStringMapIter.KEYS);
+    }
+    
+    /**
+     * return an iterator over the values
+     */
+    public synchronized PyObject itervalues() {
+        return new PyStringMapIter(keys, values, PyStringMapIter.VALUES);
+    }
 }
 
 /* extended, based on PyDictionaryIter */
@@ -613,7 +627,6 @@
         }
         return null;
     }
-
 }
 
 

Modified: branches/2.3/src/org/python/core/ZipFileImporter.java
===================================================================
--- branches/2.3/src/org/python/core/ZipFileImporter.java	2007-02-22 05:21:12 UTC (rev 3114)
+++ branches/2.3/src/org/python/core/ZipFileImporter.java	2007-02-22 05:23:37 UTC (rev 3115)
@@ -122,7 +122,9 @@
                     info = new ZipModuleInfo(zipArchive, compiledEntry, true);
                 }
             }
-            info = new ZipModuleInfo(zipArchive, sourceEntry, false);
+            if (info == null) {
+                info = new ZipModuleInfo(zipArchive, sourceEntry, false);
+            }
         }
 
         if (pkg && info != null) {


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