fix PyStringMap and PyDictionary comparison

Author: isaiah

src/org/python/core/PyStringMap.java

@@ -4,21 +4,20 @@
  */
 package org.python.core;
 
+import org.python.expose.ExposedClassMethod;
+import org.python.expose.ExposedMethod;
+import org.python.expose.ExposedNew;
+import org.python.expose.ExposedType;
+import org.python.util.Generic;
+
 import java.util.Collection;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.Set;
 import java.util.Map.Entry;
+import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 
-import org.python.expose.ExposedClassMethod;
-import org.python.expose.ExposedMethod;
-import org.python.expose.ExposedNew;
-import org.python.expose.ExposedType;
-import org.python.expose.MethodType;
-import org.python.util.Generic;
-
 /**
  * Special fast dict implementation for __dict__ instances. Allows interned String keys in addition
  * to PyObject unlike PyDictionary.
@@ -526,13 +525,21 @@ public boolean isSequenceType() {
     @Override
     public PyObject richCompare(PyObject other, CompareOp op) {
         if (op == CompareOp.EQ && other instanceof PyDictionary) {
-            for (PyObject key: ((PyDictionary) other).keys_as_list().asIterable()) {
-                if (!get(key).equals(((PyDictionary) other).get(key))) {
+            PyDictionary otherDict = (PyDictionary) other;
+            if (!keys().__eq__(otherDict.dict_keys()).__bool__()) {
+                return Py.False;
+            }
+            for (PyObject key: otherDict.keys_as_list().asIterable()) {
+                if (!get(key).equals(otherDict.get(key))) {
                     return Py.False;
                 }
             }
             return Py.True;
         }
+        if (op == CompareOp.EQ && other instanceof PyStringMap) {
+            PyStringMap otherDict = (PyStringMap) other;
+            return otherDict.table.equals(table) ? Py.True : Py.False;
+        }
         return super.richCompare(other, op);
     }
 

src/org/python/core/StringFormatter.java

@@ -96,8 +96,8 @@ int getNumber() {
         char c = pop();
         if (c == '*') {
             PyObject o = getarg();
-            if (o instanceof PyInteger) {
-                return ((PyInteger)o).getValue();
+            if (o instanceof PyLong) {
+                return ((PyLong)o).asInt();
             }
             throw Py.TypeError("* wants int");
         } else {