Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-06-23 15:30:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix html_as_json compilation under python2

Browse Source
This commit is contained in:
Kovid Goyal 2019-10-29 18:16:46 +05:30
parent 007f9fb087
commit ddb96c0eed
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/calibre/srv/html_as_json.cpp
View File

@ -121,6 +121,7 @@ public:
Py_CLEAR(this->temp); Py_CLEAR(this->temp);
Py_CLEAR(this->orig); Py_CLEAR(this->orig);
} }
void incref() { Py_XINCREF(this->orig); }
PyObject* get() { return this->orig; } PyObject* get() { return this->orig; }
const char *c_str() { return this->data; } const char *c_str() { return this->data; }
explicit operator bool() { return this->orig ? true : false; } explicit operator bool() { return this->orig ? true : false; }
@ -267,12 +268,10 @@ class Serializer {
bool bool
write_attr(PyObject *args) { write_attr(PyObject *args) {
const char *attr, *val; StringOrNone a(PyTuple_GET_ITEM(args, 0)), v(PyTuple_GET_ITEM(args, 1));
#if PY_MAJOR_VERSION > 2 a.incref(); v.incref();
if (!PyArg_ParseTuple(args, "ss", &attr, &val)) return false; if (!a || !v) return false;
#else const char *attr = a.c_str(), *val = v.c_str();
if (!PyArg_ParseTuple(args, "eses", "UTF-8", &attr, "UTF-8", &val)) return false;
#endif
const char *b = strrchr(attr, '}'); const char *b = strrchr(attr, '}');
const char *attr_name = attr; const char *attr_name = attr;
int nsindex = -1; int nsindex = -1;
@ -280,21 +279,17 @@ class Serializer {
nsindex = this->namespace_index(attr + 1, b - attr - 1); nsindex = this->namespace_index(attr + 1, b - attr - 1);
attr_name = b + 1; attr_name = b + 1;
} }
if (!write_str_literal("[")) goto end; if (!write_str_literal("[")) return false;
if (!this->write_string_as_json(attr_name)) goto end; if (!this->write_string_as_json(attr_name)) return false;
if (!write_str_literal(",")) goto end; if (!write_str_literal(",")) return false;
if (!this->write_string_as_json(val)) goto end; if (!this->write_string_as_json(val)) return false;
if (nsindex > -1) { if (nsindex > -1) {
char buf[32]; char buf[32];
this->write_data(buf, snprintf(buf, sizeof(buf), ",%d", nsindex)); this->write_data(buf, snprintf(buf, sizeof(buf), ",%d", nsindex));
} }
if (!write_str_literal("]")) goto end; if (!write_str_literal("]")) return false;
end: return true;
#if PY_MAJOR_VERSION < 3
PyMem_Free(attr); PyMem_Free(val);
#endif
return PyErr_Occurred() ? false : true;
} }
@ -378,7 +373,7 @@ public:
const char *type = (tag && tag.get() == Comment) ? "c" : "o"; const char *type = (tag && tag.get() == Comment) ? "c" : "o";
if (!this->add_comment(text.c_str(), tail.c_str(), type)) return NULL; if (!this->add_comment(text.c_str(), tail.c_str(), type)) return NULL;
} else { } else {
pyunique_ptr attrs(PyObject_CallMethod(elem, "items", NULL)); pyunique_ptr attrs(PyObject_CallMethod(elem, (char*)"items", NULL));
if (!attrs) return NULL; if (!attrs) return NULL;
if (!this->start_tag(tag.c_str(), text.c_str(), tail.c_str(), attrs.get())) return NULL; if (!this->start_tag(tag.c_str(), text.c_str(), tail.c_str(), attrs.get())) return NULL;
pyunique_ptr iterator(PyObject_GetIter(elem)); pyunique_ptr iterator(PyObject_GetIter(elem));