test_descr started breaking in yet another way in the same place.

diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 69ec66a71b6ba0325492cdecb45748a927ddc696..4d1f817e1ff62d5f60ba46a3ece020e6331fabc6 100644 (file)
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -881,7 +881,9 @@ def specials():
     verify(c1 != c2)
     verify(not c1 != c1)
     verify(not c1 == c2)
-    verify(str(c1).startswith('<C object at '))
+    # Note that the module name appears in str/repr, and that varies
+    # depending on whether this test is run standalone or from a framework.
+    verify(str(c1).find('C instance at ') >= 0)
     verify(str(c1) == repr(c1))
     verify(-1 not in c1)
     for i in range(10):
@@ -902,7 +904,9 @@ def specials():
     verify(d1 != d2)
     verify(not d1 != d1)
     verify(not d1 == d2)
-    verify(str(d1).startswith('<D object at '))
+    # Note that the module name appears in str/repr, and that varies
+    # depending on whether this test is run standalone or from a framework.
+    verify(str(d1).find('D instance at ') >= 0)
     verify(str(d1) == repr(d1))
     verify(-1 not in d1)
     for i in range(10):