mirror of
https://github.com/python/cpython.git
synced 2025-10-21 14:12:27 +00:00
Renamed PyBytes to PyByteArray
This commit is contained in:
parent
96d02f3c1e
commit
9c4756ea26
31 changed files with 397 additions and 397 deletions
|
@ -1377,11 +1377,11 @@ builtin_ord(PyObject *self, PyObject* obj)
|
|||
}
|
||||
#endif
|
||||
}
|
||||
else if (PyBytes_Check(obj)) {
|
||||
else if (PyByteArray_Check(obj)) {
|
||||
/* XXX Hopefully this is temporary */
|
||||
size = PyBytes_GET_SIZE(obj);
|
||||
size = PyByteArray_GET_SIZE(obj);
|
||||
if (size == 1) {
|
||||
ord = (long)((unsigned char)*PyBytes_AS_STRING(obj));
|
||||
ord = (long)((unsigned char)*PyByteArray_AS_STRING(obj));
|
||||
return PyLong_FromLong(ord);
|
||||
}
|
||||
}
|
||||
|
@ -1823,7 +1823,7 @@ builtin_sum(PyObject *self, PyObject *args)
|
|||
Py_DECREF(iter);
|
||||
return NULL;
|
||||
}
|
||||
if (PyBytes_Check(result)) {
|
||||
if (PyByteArray_Check(result)) {
|
||||
PyErr_SetString(PyExc_TypeError,
|
||||
"sum() can't sum bytes [use b''.join(seq) instead]");
|
||||
Py_DECREF(iter);
|
||||
|
@ -2266,7 +2266,7 @@ _PyBuiltin_Init(void)
|
|||
SETBUILTIN("True", Py_True);
|
||||
SETBUILTIN("bool", &PyBool_Type);
|
||||
SETBUILTIN("memoryview", &PyMemoryView_Type);
|
||||
SETBUILTIN("bytearray", &PyBytes_Type);
|
||||
SETBUILTIN("bytearray", &PyByteArray_Type);
|
||||
SETBUILTIN("bytes", &PyString_Type);
|
||||
SETBUILTIN("classmethod", &PyClassMethod_Type);
|
||||
#ifndef WITHOUT_COMPLEX
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue