Repair some accidents causing Windows failures:
+ test_compare. While None compares less than anything else, it's not
always the case that None has the smallest id().
+ test_descr. The output of %p (pointer) formats varies across platforms.
In particular, on Windows it doesn't produce a leading "0x".
diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py
index 51a8a40..69ec66a 100644
--- a/Lib/test/test_descr.py
+++ b/Lib/test/test_descr.py
@@ -881,8 +881,8 @@
verify(c1 != c2)
verify(not c1 != c1)
verify(not c1 == c2)
- verify(str(c1) == '<C object at 0x%x>' % id(c1))
- verify(repr(c1) == '<C object at 0x%x>' % id(c1))
+ verify(str(c1).startswith('<C object at '))
+ verify(str(c1) == repr(c1))
verify(-1 not in c1)
for i in range(10):
verify(i in c1)
@@ -902,8 +902,8 @@
verify(d1 != d2)
verify(not d1 != d1)
verify(not d1 == d2)
- verify(str(d1) == '<D object at 0x%x>' % id(d1))
- verify(repr(d1) == '<D object at 0x%x>' % id(d1))
+ verify(str(d1).startswith('<D object at '))
+ verify(str(d1) == repr(d1))
verify(-1 not in d1)
for i in range(10):
verify(i in d1)