Commit 063600d6 authored by Roman Yurchak's avatar Roman Yurchak Committed by GitHub

Merge pull request #142 from mdboom/rename-function

MAINT: Rename python2js_int to _python2js
parents 56ee2e68 ef01fab6
...@@ -109,7 +109,7 @@ is_type_name(PyObject* x, const char* name) ...@@ -109,7 +109,7 @@ is_type_name(PyObject* x, const char* name)
} }
static int static int
python2js_int(PyObject* x) _python2js(PyObject* x)
{ {
if (x == Py_None) { if (x == Py_None) {
return hiwire_undefined(); return hiwire_undefined();
...@@ -166,7 +166,7 @@ python2js_int(PyObject* x) ...@@ -166,7 +166,7 @@ python2js_int(PyObject* x)
Py_INCREF(x); Py_INCREF(x);
return pyproxy_new((int)x); return pyproxy_new((int)x);
} }
int jsitem = python2js_int(pyitem); int jsitem = _python2js(pyitem);
if (jsitem == -1) { if (jsitem == -1) {
Py_DECREF(pyitem); Py_DECREF(pyitem);
hiwire_decref(jsarray); hiwire_decref(jsarray);
...@@ -182,12 +182,12 @@ python2js_int(PyObject* x) ...@@ -182,12 +182,12 @@ python2js_int(PyObject* x)
PyObject *pykey, *pyval; PyObject *pykey, *pyval;
Py_ssize_t pos = 0; Py_ssize_t pos = 0;
while (PyDict_Next(x, &pos, &pykey, &pyval)) { while (PyDict_Next(x, &pos, &pykey, &pyval)) {
int jskey = python2js_int(pykey); int jskey = _python2js(pykey);
if (jskey == -1) { if (jskey == -1) {
hiwire_decref(jsdict); hiwire_decref(jsdict);
return -1; return -1;
} }
int jsval = python2js_int(pyval); int jsval = _python2js(pyval);
if (jsval == -1) { if (jsval == -1) {
hiwire_decref(jskey); hiwire_decref(jskey);
hiwire_decref(jsdict); hiwire_decref(jsdict);
...@@ -207,7 +207,7 @@ python2js_int(PyObject* x) ...@@ -207,7 +207,7 @@ python2js_int(PyObject* x)
int int
python2js(PyObject* x) python2js(PyObject* x)
{ {
int result = python2js_int(x); int result = _python2js(x);
if (result == -1) { if (result == -1) {
return pythonexc2js(); return pythonexc2js();
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment