|
|
@@ -138,7 +138,7 @@ static void Rocket_dealloc(Rocket *self) |
|
|
|
fclose(self->file); |
|
|
|
self->file = NULL; |
|
|
|
} |
|
|
|
self->ob_type->tp_free((PyObject *)self); |
|
|
|
Py_TYPE(self)->tp_free((PyObject *)self); |
|
|
|
} |
|
|
|
|
|
|
|
static PyObject *Rocket_new(PyTypeObject *type, PyObject *args, PyObject *kwds) |
|
|
@@ -239,7 +239,7 @@ static PyObject *Rocket_get_file_size(Rocket *self) |
|
|
|
return NULL; |
|
|
|
} |
|
|
|
} |
|
|
|
return PyInt_FromLong(self->file_size); |
|
|
|
return PyLong_FromLong(self->file_size); |
|
|
|
} |
|
|
|
|
|
|
|
/**** |
|
|
@@ -585,7 +585,7 @@ static PyObject *Rocket_extract_string(Rocket *self, PyObject *args) |
|
|
|
str[len++] = '\n'; |
|
|
|
} |
|
|
|
|
|
|
|
PyObject *pystr = PyString_FromStringAndSize(str, len); |
|
|
|
PyObject *pystr = PyBytes_FromStringAndSize(str, len); |
|
|
|
free(str); |
|
|
|
return pystr; |
|
|
|
err: |
|
|
@@ -748,7 +748,7 @@ static PyMethodDef Rocket_methods[] = { |
|
|
|
}; |
|
|
|
|
|
|
|
static PyTypeObject RocketType = { |
|
|
|
PyObject_HEAD_INIT(NULL) |
|
|
|
PyVarObject_HEAD_INIT(NULL, 0) |
|
|
|
|
|
|
|
.tp_name = "rocket.Rocket", |
|
|
|
.tp_basicsize = sizeof(Rocket), |
|
|
@@ -773,17 +773,23 @@ static PyMethodDef module_methods[] = { |
|
|
|
{ NULL }, |
|
|
|
}; |
|
|
|
|
|
|
|
PyMODINIT_FUNC |
|
|
|
initrocket(void) |
|
|
|
static struct PyModuleDef moduledef = { |
|
|
|
PyModuleDef_HEAD_INIT, |
|
|
|
.m_name = "rocker", |
|
|
|
.m_doc = "Rocket data parsing and formatting module", |
|
|
|
.m_size = -1, |
|
|
|
.m_methods = module_methods, |
|
|
|
}; |
|
|
|
|
|
|
|
PyMODINIT_FUNC PyInit_rocket(void) |
|
|
|
{ |
|
|
|
PyObject *module; |
|
|
|
|
|
|
|
RocketType.tp_new = PyType_GenericNew; |
|
|
|
if (PyType_Ready(&RocketType) < 0) |
|
|
|
return; |
|
|
|
return NULL; |
|
|
|
|
|
|
|
module = Py_InitModule3("rocket", module_methods, |
|
|
|
"Rocket data parsing and formatting module"); |
|
|
|
module = PyModule_Create(&moduledef); |
|
|
|
Py_INCREF(&RocketType); |
|
|
|
PyModule_AddObject(module, "Rocket", (PyObject *)&RocketType); |
|
|
|
|
|
|
@@ -792,5 +798,5 @@ initrocket(void) |
|
|
|
PyModule_AddObject(module, "ParseError", ParseError); |
|
|
|
add_parseerror_codes(module); |
|
|
|
|
|
|
|
return; |
|
|
|
return module; |
|
|
|
} |