mirror of
https://github.com/python/cpython.git
synced 2025-08-03 16:39:00 +00:00
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.
This commit is contained in:
parent
a19f80c6df
commit
98297ee781
148 changed files with 2533 additions and 3517 deletions
|
@ -1015,7 +1015,7 @@ class_name(PyObject *cls)
|
|||
if (name == NULL) {
|
||||
PyErr_Clear();
|
||||
Py_XDECREF(name);
|
||||
name = PyObject_ReprStr8(cls);
|
||||
name = PyObject_Repr(cls);
|
||||
}
|
||||
if (name == NULL)
|
||||
return NULL;
|
||||
|
@ -1654,7 +1654,7 @@ type_new(PyTypeObject *metatype, PyObject *args, PyObject *kwds)
|
|||
}
|
||||
|
||||
/* Check arguments: (name, bases, dict) */
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "SO!O!:type", kwlist,
|
||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "UO!O!:type", kwlist,
|
||||
&name,
|
||||
&PyTuple_Type, &bases,
|
||||
&PyDict_Type, &dict))
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue