update failing tests to handle mixed-key-type sorting, rm now obsolete 'unsortable' xfail test

Author: jheiv

Lib/test/test_json/test_dump.py

@@ -28,7 +28,7 @@ def test_encode_truefalse(self):
                  '{"false": true, "true": false}')
         self.assertEqual(self.dumps(
                 {2: 3.0, 4.0: 5, False: 1, 6: True}, sort_keys=True),
-                '{"false": 1, "2": 3.0, "4.0": 5, "6": true}')
+                '{"2": 3.0, "4.0": 5, "6": true, "false": 1}')
 
     # Issue 16228: Crash on encoding resized list
     def test_encode_mutated(self):

Lib/test/test_json/test_speedups.py

@@ -68,6 +68,3 @@ def test(name):
         self.assertRaises(ZeroDivisionError, test, 'allow_nan')
         self.assertRaises(ZeroDivisionError, test, 'sort_keys')
 
-    def test_unsortable_keys(self):
-        with self.assertRaises(TypeError):
-            self.json.encoder.JSONEncoder(sort_keys=True).encode({'a': 1, 1: 'a'})