PyTypeObject *bytestring_pytype;
-PyObject *bytestring_pywrap(const void *p, size_t n)
+static PyObject *dowrap(PyTypeObject *ty, const void *p, size_t n)
{
- PyStringObject *x = PyObject_NewVar(PyStringObject, bytestring_pytype, n);
+ PyStringObject *x = (PyStringObject *)ty->tp_alloc(ty, n);
if (p) memcpy(x->ob_sval, p, n);
x->ob_sval[n] = 0;
#ifdef CACHE_HASH
x->ob_shash = -1;
#endif
-#ifdef INTERN_STRINGS
- x->ob_sinterned = NULL;
-#endif
+ x->ob_sstate = SSTATE_NOT_INTERNED;
return ((PyObject *)x);
}
+PyObject *bytestring_pywrap(const void *p, size_t n)
+ { return (dowrap(bytestring_pytype, p, n)); }
+
PyObject *bytestring_pywrapbuf(buf *b)
- { return bytestring_pywrap(BCUR(b), BLEFT(b)); }
+ { return (dowrap(bytestring_pytype, BCUR(b), BLEFT(b))); }
+
+static PyObject *bytestring_pynew(PyTypeObject *ty,
+ PyObject *arg, PyObject *kw)
+{
+ const char *p;
+ int n;
+ static char *kwlist[] = { "data", 0 };
+ if (!PyArg_ParseTupleAndKeywords(arg, kw, "s#:new", kwlist, &p, &n))
+ return (0);
+ return (dowrap(ty, p, n));
+}
#define BINOP(name, op) \
static PyObject *bytestring_py##name(PyObject *x, PyObject *y) { \
static PyBufferProcs bytestring_pybuffer;
static PyTypeObject bytestring_pytype_skel = {
- PyObject_HEAD_INIT(&PyType_Type) 0, /* Header */
+ PyObject_HEAD_INIT(0) 0, /* Header */
"catacomb.ByteString", /* @tp_name@ */
0, /* @tp_basicsize@ */
0, /* @tp_itemsize@ */
0, /* @tp_dictoffset@ */
0, /* @tp_init@ */
PyType_GenericAlloc, /* @tp_alloc@ */
- 0, /* @tp_new@ */
- _PyObject_Del, /* @tp_free@ */
+ bytestring_pynew, /* @tp_new@ */
+ 0, /* @tp_free@ */
0 /* @tp_is_gc@ */
};