diff options
| author | Guido van Rossum <guido@python.org> | 2007-11-06 21:34:58 +0000 |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 2007-11-06 21:34:58 +0000 |
| commit | f30787b61e3d43d90887955cece23652b16f4fd5 (patch) | |
| tree | c012a4d4f3a340842871635f5f89585371140c57 /Include/pyerrors.h | |
| parent | a75539107c7a46872a936ec373ba1084db35c296 (diff) | |
| download | cpython-f30787b61e3d43d90887955cece23652b16f4fd5.tar.gz | |
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.
Diffstat (limited to 'Include/pyerrors.h')
| -rw-r--r-- | Include/pyerrors.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Include/pyerrors.h b/Include/pyerrors.h index 6e2f5cfbc1..b499778954 100644 --- a/Include/pyerrors.h +++ b/Include/pyerrors.h @@ -165,6 +165,7 @@ PyAPI_DATA(PyObject *) PyExc_RuntimeWarning; PyAPI_DATA(PyObject *) PyExc_FutureWarning; PyAPI_DATA(PyObject *) PyExc_ImportWarning; PyAPI_DATA(PyObject *) PyExc_UnicodeWarning; +PyAPI_DATA(PyObject *) PyExc_BytesWarning; /* Convenience functions */ |