If interning an instance of a string subclass, intern a real string object

with the same value instead.  This ensures that a string (or string
subclass) object's ob_sinterned pointer is always a str (or NULL), and
that the dict of interned strings only has strs as keys.

Lib/test/test_descr.py

@@ -1529,6 +1529,20 @@ def rev(self):
     verify(s.lower().__class__ is str)
     verify(s.lower() == base)
 
+    s = madstring("x y")
+    verify(intern(s).__class__ is str)
+    verify(intern(s) is intern("x y"))
+    verify(intern(s) == "x y")
+
+    i = intern("y x")
+    s = madstring("y x")
+    verify(intern(s).__class__ is str)
+    verify(intern(s) is i)
+
+    s = madstring(i)
+    verify(intern(s).__class__ is str)
+    verify(intern(s) is i)
+
     class madunicode(unicode):
         _rev = None
         def rev(self):

Objects/stringobject.c

@@ -3553,10 +3553,26 @@ PyString_InternInPlace(PyObject **p)
 		Py_DECREF(s);
 		return;
 	}
-	t = (PyObject *)s;
+	/* Ensure that only true string objects appear in the intern dict,
-	if (PyDict_SetItem(interned, t, t) == 0) {
+	   and as the value of ob_sinterned. */
-		s->ob_sinterned = t;
+	if (PyString_CheckExact(s)) {
-		return;
+		t = (PyObject *)s;
+		if (PyDict_SetItem(interned, t, t) == 0) {
+			s->ob_sinterned = t;
+			return;
+		}
+	}
+	else {
+		t = PyString_FromStringAndSize(PyString_AS_STRING(s),
+						PyString_GET_SIZE(s));
+		if (t != NULL) {
+			if (PyDict_SetItem(interned, t, t) == 0) {
+				*p = s->ob_sinterned = t;
+				Py_DECREF(s);
+				return;
+			}
+			Py_DECREF(t);
+		}
 	}
 	PyErr_Clear();
 }