ENH: ujson python 3 defines

wesm · wesm · commit 051c3ba307c2 · 2012-05-25T14:52:25.000-04:00
diff --git a/pandas/src/ujson/python/objToJSON.c b/pandas/src/ujson/python/objToJSON.c
@@ -1086,17 +1086,17 @@ void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc)
         return;
     }
     else
-    if (PyString_Check(obj))
+    if (PyUnicode_Check(obj))
     {
         PRINTMARK();
-        pc->PyTypeToJSON = PyStringToUTF8; tc->type = JT_UTF8;
+        pc->PyTypeToJSON = PyUnicodeToUTF8; tc->type = JT_UTF8;
         return;
     }
     else
-    if (PyUnicode_Check(obj))
+    if (PyString_Check(obj))
     {
         PRINTMARK();
-        pc->PyTypeToJSON = PyUnicodeToUTF8; tc->type = JT_UTF8;
+        pc->PyTypeToJSON = PyStringToUTF8; tc->type = JT_UTF8;
         return;
     }
     else

Original file line number	Diff line number	Diff line change
`@@ -1086,17 +1086,17 @@ void Object_beginTypeContext (JSOBJ _obj, JSONTypeContext *tc)`
`1086`	`1086`	`return;`
`1087`	`1087`	`}`
`1088`	`1088`	`else`
`1089`		`- if (PyString_Check(obj))`
	`1089`	`+ if (PyUnicode_Check(obj))`
`1090`	`1090`	`{`
`1091`	`1091`	`PRINTMARK();`
`1092`		`- pc->PyTypeToJSON = PyStringToUTF8; tc->type = JT_UTF8;`
	`1092`	`+ pc->PyTypeToJSON = PyUnicodeToUTF8; tc->type = JT_UTF8;`
`1093`	`1093`	`return;`
`1094`	`1094`	`}`
`1095`	`1095`	`else`
`1096`		`- if (PyUnicode_Check(obj))`
	`1096`	`+ if (PyString_Check(obj))`
`1097`	`1097`	`{`
`1098`	`1098`	`PRINTMARK();`
`1099`		`- pc->PyTypeToJSON = PyUnicodeToUTF8; tc->type = JT_UTF8;`
	`1099`	`+ pc->PyTypeToJSON = PyStringToUTF8; tc->type = JT_UTF8;`
`1100`	`1100`	`return;`
`1101`	`1101`	`}`
`1102`	`1102`	`else`