Merged revisions 83016 via svnmerge from

dhellmann · dhellmann · commit 76e57947a104 · 2010-07-21T12:35:38.000Z
svn+ssh://pythondev@svn.python.org/python/branches/py3k

........
  r83016 | doug.hellmann | 2010-07-21 08:29:04 -0400 (Wed, 21 Jul 2010) | 1 line

  Apply patch from Ray Allen for issue 9296
........
diff --git a/Lib/json/tests/test_fail.py b/Lib/json/tests/test_fail.py
@@ -74,3 +74,12 @@ def test_failures(self):
                 pass
             else:
                 self.fail("Expected failure for fail{0}.json: {1!r}".format(idx, doc))
+
+    def test_non_string_keys_dict(self):
+        data = {'a' : 1, (1, 2) : 2}
+
+        #This is for c encoder
+        self.assertRaises(TypeError, json.dumps, data)
+
+        #This is for python encoder
+        self.assertRaises(TypeError, json.dumps, data, indent=True)
diff --git a/Modules/_json.c b/Modules/_json.c
@@ -1454,7 +1454,7 @@ encoder_listencode_dict(PyEncoderObject *s, PyObject *rval, PyObject *dct, Py_ss
         }
         else {
             /* TODO: include repr of key */
-            PyErr_SetString(PyExc_ValueError, "keys must be a string");
+            PyErr_SetString(PyExc_TypeError, "keys must be a string");
             goto bail;
         }
 

Original file line number	Diff line number	Diff line change
`@@ -1454,7 +1454,7 @@ encoder_listencode_dict(PyEncoderObject s, PyObject rval, PyObject *dct, Py_ss`
`1454`	`1454`	`}`
`1455`	`1455`	`else {`
`1456`	`1456`	`/* TODO: include repr of key */`
`1457`		`- PyErr_SetString(PyExc_ValueError, "keys must be a string");`
	`1457`	`+ PyErr_SetString(PyExc_TypeError, "keys must be a string");`
`1458`	`1458`	`goto bail;`
`1459`	`1459`	`}`
`1460`	`1460`