mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-01 15:43:13 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Renamed PyString to PyBytes

Browse source
This commit is contained in:
Christian Heimes 2008-05-26 12:51:38 +00:00
parent c3cb683d63
commit 593daf545b
176 changed files with 2793 additions and 2791 deletions
Download patch file Download diff file Expand all files Collapse all files

96
Objects/exceptions.c
View file

@ -44,7 +44,7 @@ BaseException_new(PyTypeObject *type, PyObject *args, PyObject *kwds)
return NULL;
}
self->message = PyString_FromString("");
self->message = PyBytes_FromString("");
if (!self->message) {
Py_DECREF(self);
return NULL;
@ -104,7 +104,7 @@ BaseException_str(PyBaseExceptionObject *self)
switch (PyTuple_GET_SIZE(self->args)) {
case 0:
out = PyString_FromString("");
out = PyBytes_FromString("");
break;
case 1:
out = PyObject_Str(PyTuple_GET_ITEM(self->args, 0));
@ -133,13 +133,13 @@ BaseException_repr(PyBaseExceptionObject *self)
dot = strrchr(name, '.');
if (dot != NULL) name = dot+1;
repr = PyString_FromString(name);
repr = PyBytes_FromString(name);
if (!repr) {
Py_DECREF(repr_suffix);
return NULL;
}
PyString_ConcatAndDel(&repr, repr_suffix);
PyBytes_ConcatAndDel(&repr, repr_suffix);
return repr;
}
@ -610,7 +610,7 @@ EnvironmentError_str(PyEnvironmentErrorObject *self)
PyObject *repr;
PyObject *tuple;
fmt = PyString_FromString("[Errno %s] %s: %s");
fmt = PyBytes_FromString("[Errno %s] %s: %s");
if (!fmt)
return NULL;
@ -645,7 +645,7 @@ EnvironmentError_str(PyEnvironmentErrorObject *self)
PyTuple_SET_ITEM(tuple, 2, repr);
rtnval = PyString_Format(fmt, tuple);
rtnval = PyBytes_Format(fmt, tuple);
Py_DECREF(fmt);
Py_DECREF(tuple);
@ -654,7 +654,7 @@ EnvironmentError_str(PyEnvironmentErrorObject *self)
PyObject *fmt;
PyObject *tuple;
fmt = PyString_FromString("[Errno %s] %s");
fmt = PyBytes_FromString("[Errno %s] %s");
if (!fmt)
return NULL;
@ -681,7 +681,7 @@ EnvironmentError_str(PyEnvironmentErrorObject *self)
PyTuple_SET_ITEM(tuple, 1, Py_None);
}
rtnval = PyString_Format(fmt, tuple);
rtnval = PyBytes_Format(fmt, tuple);
Py_DECREF(fmt);
Py_DECREF(tuple);
@ -841,7 +841,7 @@ WindowsError_str(PyWindowsErrorObject *self)
PyObject *repr;
PyObject *tuple;
fmt = PyString_FromString("[Error %s] %s: %s");
fmt = PyBytes_FromString("[Error %s] %s: %s");
if (!fmt)
return NULL;
@ -876,7 +876,7 @@ WindowsError_str(PyWindowsErrorObject *self)
PyTuple_SET_ITEM(tuple, 2, repr);
rtnval = PyString_Format(fmt, tuple);
rtnval = PyBytes_Format(fmt, tuple);
Py_DECREF(fmt);
Py_DECREF(tuple);
@ -885,7 +885,7 @@ WindowsError_str(PyWindowsErrorObject *self)
PyObject *fmt;
PyObject *tuple;
fmt = PyString_FromString("[Error %s] %s");
fmt = PyBytes_FromString("[Error %s] %s");
if (!fmt)
return NULL;
@ -912,7 +912,7 @@ WindowsError_str(PyWindowsErrorObject *self)
PyTuple_SET_ITEM(tuple, 1, Py_None);
}
rtnval = PyString_Format(fmt, tuple);
rtnval = PyBytes_Format(fmt, tuple);
Py_DECREF(fmt);
Py_DECREF(tuple);
@ -1109,21 +1109,21 @@ SyntaxError_str(PySyntaxErrorObject *self)
str = PyObject_Str(Py_None);
if (!str) return NULL;
/* Don't fiddle with non-string return (shouldn't happen anyway) */
if (!PyString_Check(str)) return str;
if (!PyBytes_Check(str)) return str;
/* XXX -- do all the additional formatting with filename and
lineno here */
have_filename = (self->filename != NULL) &&
PyString_Check(self->filename);
PyBytes_Check(self->filename);
have_lineno = (self->lineno != NULL) && PyInt_Check(self->lineno);
if (!have_filename && !have_lineno)
return str;
bufsize = PyString_GET_SIZE(str) + 64;
bufsize = PyBytes_GET_SIZE(str) + 64;
if (have_filename)
bufsize += PyString_GET_SIZE(self->filename);
bufsize += PyBytes_GET_SIZE(self->filename);
buffer = PyMem_MALLOC(bufsize);
if (buffer == NULL)
@ -1131,19 +1131,19 @@ SyntaxError_str(PySyntaxErrorObject *self)
if (have_filename && have_lineno)
PyOS_snprintf(buffer, bufsize, "%s (%s, line %ld)",
PyString_AS_STRING(str),
my_basename(PyString_AS_STRING(self->filename)),
PyBytes_AS_STRING(str),
my_basename(PyBytes_AS_STRING(self->filename)),
PyInt_AsLong(self->lineno));
else if (have_filename)
PyOS_snprintf(buffer, bufsize, "%s (%s)",
PyString_AS_STRING(str),
my_basename(PyString_AS_STRING(self->filename)));
PyBytes_AS_STRING(str),
my_basename(PyBytes_AS_STRING(self->filename)));
else /* only have_lineno */
PyOS_snprintf(buffer, bufsize, "%s (line %ld)",
PyString_AS_STRING(str),
PyBytes_AS_STRING(str),
PyInt_AsLong(self->lineno));
result = PyString_FromString(buffer);
result = PyBytes_FromString(buffer);
PyMem_FREE(buffer);
if (result == NULL)
@ -1250,7 +1250,7 @@ get_string(PyObject *attr, const char *name)
return NULL;
}
if (!PyString_Check(attr)) {
if (!PyBytes_Check(attr)) {
PyErr_Format(PyExc_TypeError, "%.200s attribute must be str", name);
return NULL;
}
@ -1262,7 +1262,7 @@ get_string(PyObject *attr, const char *name)
static int
set_string(PyObject **attr, const char *value)
{
PyObject *obj = PyString_FromString(value);
PyObject *obj = PyBytes_FromString(value);
if (!obj)
return -1;
Py_CLEAR(*attr);
@ -1345,7 +1345,7 @@ PyUnicodeDecodeError_GetStart(PyObject *exc, Py_ssize_t *start)
"object");
if (!obj)
return -1;
size = PyString_GET_SIZE(obj);
size = PyBytes_GET_SIZE(obj);
*start = ((PyUnicodeErrorObject *)exc)->start;
if (*start<0)
*start = 0;
@ -1415,7 +1415,7 @@ PyUnicodeDecodeError_GetEnd(PyObject *exc, Py_ssize_t *end)
if (!obj)
return -1;
*end = ((PyUnicodeErrorObject *)exc)->end;
size = PyString_GET_SIZE(obj);
size = PyBytes_GET_SIZE(obj);
if (*end<1)
*end = 1;
if (*end>size)
@ -1506,11 +1506,11 @@ UnicodeError_init(PyUnicodeErrorObject *self, PyObject *args, PyObject *kwds,
Py_CLEAR(self->reason);
if (!PyArg_ParseTuple(args, "O!O!nnO!",
&PyString_Type, &self->encoding,
&PyBytes_Type, &self->encoding,
objecttype, &self->object,
&self->start,
&self->end,
&PyString_Type, &self->reason)) {
&PyBytes_Type, &self->reason)) {
self->encoding = self->object = self->reason = NULL;
return -1;
}
@ -1590,20 +1590,20 @@ UnicodeEncodeError_str(PyObject *self)
PyOS_snprintf(badchar_str, sizeof(badchar_str), "u%04x", badchar);
else
PyOS_snprintf(badchar_str, sizeof(badchar_str), "U%08x", badchar);
return PyString_FromFormat(
return PyBytes_FromFormat(
"'%.400s' codec can't encode character u'\\%s' in position %zd: %.400s",
PyString_AS_STRING(uself->encoding),
PyBytes_AS_STRING(uself->encoding),
badchar_str,
uself->start,
PyString_AS_STRING(uself->reason)
PyBytes_AS_STRING(uself->reason)
);
}
return PyString_FromFormat(
return PyBytes_FromFormat(
"'%.400s' codec can't encode characters in position %zd-%zd: %.400s",
PyString_AS_STRING(uself->encoding),
PyBytes_AS_STRING(uself->encoding),
uself->start,
uself->end-1,
PyString_AS_STRING(uself->reason)
PyBytes_AS_STRING(uself->reason)
);
}
@ -1642,7 +1642,7 @@ UnicodeDecodeError_init(PyObject *self, PyObject *args, PyObject *kwds)
if (BaseException_init((PyBaseExceptionObject *)self, args, kwds) == -1)
return -1;
return UnicodeError_init((PyUnicodeErrorObject *)self, args,
kwds, &PyString_Type);
kwds, &PyBytes_Type);
}
static PyObject *
@ -1654,21 +1654,21 @@ UnicodeDecodeError_str(PyObject *self)
/* FromFormat does not support %02x, so format that separately */
char byte[4];
PyOS_snprintf(byte, sizeof(byte), "%02x",
((int)PyString_AS_STRING(uself->object)[uself->start])&0xff);
return PyString_FromFormat(
((int)PyBytes_AS_STRING(uself->object)[uself->start])&0xff);
return PyBytes_FromFormat(
"'%.400s' codec can't decode byte 0x%s in position %zd: %.400s",
PyString_AS_STRING(uself->encoding),
PyBytes_AS_STRING(uself->encoding),
byte,
uself->start,
PyString_AS_STRING(uself->reason)
PyBytes_AS_STRING(uself->reason)
);
}
return PyString_FromFormat(
return PyBytes_FromFormat(
"'%.400s' codec can't decode bytes in position %zd-%zd: %.400s",
PyString_AS_STRING(uself->encoding),
PyBytes_AS_STRING(uself->encoding),
uself->start,
uself->end-1,
PyString_AS_STRING(uself->reason)
PyBytes_AS_STRING(uself->reason)
);
}
@ -1718,7 +1718,7 @@ UnicodeTranslateError_init(PyUnicodeErrorObject *self, PyObject *args,
&PyUnicode_Type, &self->object,
&self->start,
&self->end,
&PyString_Type, &self->reason)) {
&PyBytes_Type, &self->reason)) {
self->object = self->reason = NULL;
return -1;
}
@ -1744,18 +1744,18 @@ UnicodeTranslateError_str(PyObject *self)
PyOS_snprintf(badchar_str, sizeof(badchar_str), "u%04x", badchar);
else
PyOS_snprintf(badchar_str, sizeof(badchar_str), "U%08x", badchar);
return PyString_FromFormat(
return PyBytes_FromFormat(
"can't translate character u'\\%s' in position %zd: %.400s",
badchar_str,
uself->start,
PyString_AS_STRING(uself->reason)
PyBytes_AS_STRING(uself->reason)
);
}
return PyString_FromFormat(
return PyBytes_FromFormat(
"can't translate characters in position %zd-%zd: %.400s",
uself->start,
uself->end-1,
PyString_AS_STRING(uself->reason)
PyBytes_AS_STRING(uself->reason)
);
}
@ -2111,7 +2111,7 @@ _PyExc_Init(void)
(PyBaseExceptionObject *)PyExc_RecursionErrorInst;
PyObject *args_tuple;
PyObject *exc_message;
exc_message = PyString_FromString("maximum recursion depth exceeded");
exc_message = PyBytes_FromString("maximum recursion depth exceeded");
if (!exc_message)
Py_FatalError("cannot allocate argument for RuntimeError "
"pre-allocation");