Merge pull request #696 from wireservice/jsonkey

Fix for "TypeError: key Decimal(…) is not a string"

agate/table/to_json.py

@@ -78,7 +78,7 @@ def dump_json(data):
                 if key_is_row_function:
                     k = key(row)
                 else:
-                    k = row[key]
+                    k = str(row[key]) if six.PY3 else unicode(row[key])
 
                 if k in output:
                     raise ValueError('Value %s is not unique in the key column.' % six.text_type(k))

examples/test_non_string_keyed.json

@@ -0,0 +1,26 @@
+{
+    "1": {
+        "number": 1.0,
+        "text": "a",
+        "boolean": true,
+        "date": "2015-11-04",
+        "datetime": "2015-11-04T12:22:00",
+        "timedelta": "0:04:15"
+    },
+    "2": {
+        "number": 2.0,
+        "text": "👍",
+        "boolean": false,
+        "date": "2015-11-05",
+        "datetime": "2015-11-04T12:45:00",
+        "timedelta": "0:06:18"
+    },
+    "None": {
+        "number": null,
+        "text": "b",
+        "boolean": null,
+        "date": null,
+        "datetime": null,
+        "timedelta": null
+    }
+}

tests/test_table/test_to_json.py

@@ -53,6 +53,19 @@ def test_to_json_key(self):
 
         self.assertEqual(js1, js2)
 
+    def test_to_json_non_string_key(self):
+        table = Table(self.rows, self.column_names, self.column_types)
+
+        output = six.StringIO()
+        table.to_json(output, key='number', indent=4)
+
+        js1 = json.loads(output.getvalue())
+
+        with open('examples/test_non_string_keyed.json') as f:
+            js2 = json.load(f)
+
+        self.assertEqual(js1, js2)
+
     def test_to_json_key_func(self):
         table = Table(self.rows, self.column_names, self.column_types)