}
}
else if (PyBytes_CheckExact(v)) {
- w_byte(TYPE_STRING, p);
+ W_TYPE(TYPE_STRING, p);
- n = PyBytes_GET_SIZE(v);
- W_SIZE(n, p);
- w_string(PyBytes_AS_STRING(v), n, p);
+ w_pstring(PyBytes_AS_STRING(v), PyBytes_GET_SIZE(v), p);
}
else if (PyUnicode_CheckExact(v)) {
PyObject *utf8;
p->error = WFERR_UNMARSHALLABLE;
return;
}
- w_byte(TYPE_UNICODE, p);
+ if (p->version >= 3 && PyUnicode_CHECK_INTERNED(v))
+ W_TYPE(TYPE_INTERNED, p);
+ else
+ W_TYPE(TYPE_UNICODE, p);
- n = PyBytes_GET_SIZE(utf8);
- W_SIZE(n, p);
- w_string(PyBytes_AS_STRING(utf8), n, p);
+ w_pstring(PyBytes_AS_STRING(utf8), PyBytes_GET_SIZE(utf8), p);
Py_DECREF(utf8);
}
else if (PyTuple_CheckExact(v)) {
p->error = WFERR_UNMARSHALLABLE;
return;
}
- w_byte(TYPE_STRING, p);
+ W_TYPE(TYPE_STRING, p);
- n = view.len;
- s = view.buf;
- W_SIZE(n, p);
- w_string(s, n, p);
+ w_pstring(view.buf, view.len, p);
PyBuffer_Release(&view);
}
else {