Make indent param only accept integers. Fixes #25.

python-rapidjson · Sep 20, 2015 · 2bb9076 · lelit · Dec 4, 2015 · kenrobbins
1 parent 52117fc
commit 2bb9076
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 19 deletions.
diff --git a/python-rapidjson/rapidjson.cpp b/python-rapidjson/rapidjson.cpp
@@ -692,8 +692,8 @@ rapidjson_dumps(PyObject* self, PyObject* args, PyObject* kwargs)
     DatetimeMode datetimeMode = DATETIME_MODE_NONE;
 
     bool prettyPrint = false;
-    char indentChar = ' ';
-    unsigned indentCharCount = 4;
+    const char indentChar = ' ';
+    unsigned char indentCharCount = 4;
 
     static char* kwlist[] = {
         "s",
@@ -733,24 +733,8 @@ rapidjson_dumps(PyObject* self, PyObject* args, PyObject* kwargs)
         if (PyLong_Check(indent)) {
             indentCharCount = PyLong_AsLong(indent);
         }
-        else if (PyUnicode_Check(indent)) {
-            char* s = PyUnicode_AsUTF8(indent);
-
-            if (s != NULL) {
-                indentCharCount = strlen(s);
-                indentChar = *s;
-            }
-        }
-        else if (PyBytes_Check(indent)) {
-            char* s = PyBytes_AsString(indent);
-
-            if (s != NULL) {
-                indentCharCount = strlen(s);
-                indentChar = *s;
-            }
-        }
         else {
-            PyErr_Format(PyExc_TypeError, "indent must be an int or a string");
+            PyErr_Format(PyExc_TypeError, "indent must be an int");
             return NULL;
         }
     }

diff --git a/tests/test_params.py b/tests/test_params.py
@@ -53,6 +53,9 @@ def test_indent():
 
     assert rapidjson.dumps(o, indent=4) in expected
 
+    with pytest.raises(TypeError):
+        rapidjson.dumps(o, indent="\t")
+
 
 @pytest.mark.unit
 def test_sort_keys():