commit db780d0d13976b099b22bc5145a53ec3ff6c63ba
author Benjamin Peterson <benjamin@python.org> Mon Apr 23 13:44:32 2012 -0400
committer Benjamin Peterson <benjamin@python.org> Mon Apr 23 13:44:32 2012 -0400
tree 0857fe4b93ec2419c47ae92fc0e75d0babaa8e4a
parent 53b977127fe8192f8bdf6a400de81086e128e936

fix instance dicts with str subclasses (#13903)

Objects/dictobject.c

diff --git a/Objects/dictobject.c b/Objects/dictobject.c
index 2afbbae..51a8796 100644
--- a/Objects/dictobject.c
+++ b/Objects/dictobject.c
@@ -641,7 +641,11 @@
     register PyDictKeyEntry *ep;
 
     if (!PyUnicode_CheckExact(key)) {
-        return lookdict(mp, key, hash, value_addr);
+        ep = lookdict(mp, key, hash, value_addr);
+        /* lookdict expects a combined-table, so fix value_addr */
+        i = ep - ep0;
+        *value_addr = &mp->ma_values[i];
+        return ep;
     }
     i = (size_t)hash & mask;
     ep = &ep0[i];