Merging the py3k-pep3137 branch back into the py3k branch.
No detailed change log; just check out the change log for the py3k-pep3137
branch. The most obvious changes:
- str8 renamed to bytes (PyString at the C level);
- bytes renamed to buffer (PyBytes at the C level);
- PyString and PyUnicode are no longer compatible.
I.e. we now have an immutable bytes type and a mutable bytes type.
The behavior of PyString was modified quite a bit, to make it more
bytes-like. Some changes are still on the to-do list.
diff --git a/Python/sysmodule.c b/Python/sysmodule.c
index d140fe3..ffaa596 100644
--- a/Python/sysmodule.c
+++ b/Python/sysmodule.c
@@ -225,14 +225,9 @@
sys_intern(PyObject *self, PyObject *args)
{
PyObject *s;
- if (!PyArg_ParseTuple(args, "S:intern", &s))
+ if (!PyArg_ParseTuple(args, "U:intern", &s))
return NULL;
- if (PyString_CheckExact(s)) {
- Py_INCREF(s);
- PyString_InternInPlace(&s);
- return s;
- }
- else if (PyUnicode_CheckExact(s)) {
+ if (PyUnicode_CheckExact(s)) {
Py_INCREF(s);
PyUnicode_InternInPlace(&s);
return s;