[Python-checkins] cpython (2.7): Avoid py3k warnings related to sort() of unrelated types.

[antoine.pitrou]

http://hg.python.org/cpython/rev/48a91063890c
changeset:   75161:48a91063890c
branch:      2.7
parent:      75159:f3e2a9d25ffa
user:        Antoine Pitrou <solipsis at pitrou.net>
date:        Wed Feb 22 00:28:46 2012 +0100
summary:
  Avoid py3k warnings related to sort() of unrelated types.

files:
  Lib/test/mapping_tests.py |  10 +++++++---
  1 files changed, 7 insertions(+), 3 deletions(-)


diff --git a/Lib/test/mapping_tests.py b/Lib/test/mapping_tests.py
--- a/Lib/test/mapping_tests.py
+++ b/Lib/test/mapping_tests.py
@@ -209,8 +209,12 @@
         d.update(SimpleUserDict())
         i1 = d.items()
         i2 = self.reference.items()
-        i1.sort()
-        i2.sort()
+
+        def safe_sort_key(kv):
+            k, v = kv
+            return id(type(k)), id(type(v)), k, v
+        i1.sort(key=safe_sort_key)
+        i2.sort(key=safe_sort_key)
         self.assertEqual(i1, i2)
 
         class Exc(Exception): pass
@@ -343,7 +347,7 @@
         self.assertTrue(not d.has_key('a'))
         d = self._full_mapping({'a': 1, 'b': 2})
         k = d.keys()
-        k.sort()
+        k.sort(key=lambda k: (id(type(k)), k))
         self.assertEqual(k, ['a', 'b'])
 
         self.assertRaises(TypeError, d.has_key)

-- 
Repository URL: http://hg.python.org/cpython