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

[<le...@us...>]

Revision: 6010
          http://jython.svn.sourceforge.net/jython/?rev=6010&view=rev
Author:   leosoto
Date:     2009-02-04 00:51:47 +0000 (Wed, 04 Feb 2009)

Log Message:
-----------
PyObject#reduce_2: Use invoke("iteritems") instead of this.iteritems() to avoid problems with dict subclasses which override iteritems on python code. Fixes #1257

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

Modified: trunk/jython/src/org/python/core/PyObject.java
===================================================================
--- trunk/jython/src/org/python/core/PyObject.java	2009-02-03 21:25:23 UTC (rev 6009)
+++ trunk/jython/src/org/python/core/PyObject.java	2009-02-04 00:51:47 UTC (rev 6010)
@@ -3904,7 +3904,7 @@
         if (!(this instanceof PyDictionary)) {
             dictitems = Py.None;
         } else {
-            dictitems = ((PyDictionary)this).iteritems();
+            dictitems = invoke("iteritems");
         }
 
         PyObject copyreg = __builtin__.__import__("copy_reg", null, null, Py.EmptyTuple);


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