Skip to content

Commit d3364c3

Browse files
committed
TST: test 3.4 on windows
BLD: bug in building json compiled code
1 parent 1b53d88 commit d3364c3

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

appveyor.yml

+6
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,12 @@ environment:
3030
CONDA_PY: "27"
3131
CONDA_NPY: "110"
3232

33+
- CONDA_ROOT: "C:\\Miniconda3_64"
34+
PYTHON_VERSION: "3.4"
35+
PYTHON_ARCH: "64"
36+
CONDA_PY: "34"
37+
CONDA_NPY: "111"
38+
3339
# We always use a 64-bit machine, but can build x86 distributions
3440
# with the PYTHON_ARCH variable (which is used by CMD_IN_ENV).
3541
platform:

ci/requirements-3.4_WIN.run

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
python-dateutil
2+
pytz
3+
numpy

pandas/_libs/src/ujson/python/objToJSON.c

+4-3
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,8 @@ static void *PyStringToUTF8(JSOBJ _obj, JSONTypeContext *tc, void *outValue,
401401

402402
static void *PyUnicodeToUTF8(JSOBJ _obj, JSONTypeContext *tc, void *outValue,
403403
size_t *_outLen) {
404-
PyObject *obj = (PyObject *)_obj;
404+
PyObject *obj, *newObj;
405+
obj = (PyObject *)_obj;
405406

406407
#if (PY_VERSION_HEX >= 0x03030000)
407408
if (PyUnicode_IS_COMPACT_ASCII(obj)) {
@@ -412,8 +413,8 @@ static void *PyUnicodeToUTF8(JSOBJ _obj, JSONTypeContext *tc, void *outValue,
412413
}
413414
#endif
414415

415-
PyObject *newObj = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(obj),
416-
PyUnicode_GET_SIZE(obj), NULL);
416+
newObj = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(obj),
417+
PyUnicode_GET_SIZE(obj), NULL);
417418

418419
GET_TC(tc)->newObj = newObj;
419420

0 commit comments

Comments
 (0)