From: Finn B. <bc...@us...> - 2001-04-13 18:32:09
|
Update of /cvsroot/jython/jython/org/python/core In directory usw-pr-cvs1:/tmp/cvs-serv29349 Modified Files: PyDictionary.java Log Message: update(): Allow PyStringMap as argument. Index: PyDictionary.java =================================================================== RCS file: /cvsroot/jython/jython/org/python/core/PyDictionary.java,v retrieving revision 2.14 retrieving revision 2.15 diff -C2 -r2.14 -r2.15 *** PyDictionary.java 2001/03/04 18:08:59 2.14 --- PyDictionary.java 2001/04/13 18:32:05 2.15 *************** *** 52,59 **** case 14: if (arg instanceof PyDictionary) { ! dict.update((PyDictionary)arg); return Py.None; ! } ! else throw Py.TypeError("dictionary expected, got " + arg.safeRepr()); --- 52,61 ---- case 14: if (arg instanceof PyDictionary) { ! dict.update((PyDictionary) arg); return Py.None; ! } else if (arg instanceof PyStringMap) { ! dict.update((PyStringMap) arg); ! return Py.None; ! } else throw Py.TypeError("dictionary expected, got " + arg.safeRepr()); |