Renamed PyString to PyBytes
diff --git a/Python/ceval.c b/Python/ceval.c
index 0cff157..bf48255 100644
--- a/Python/ceval.c
+++ b/Python/ceval.c
@@ -739,7 +739,7 @@
consts = co->co_consts;
fastlocals = f->f_localsplus;
freevars = f->f_localsplus + co->co_nlocals;
- first_instr = (unsigned char*) PyString_AS_STRING(co->co_code);
+ first_instr = (unsigned char*) PyBytes_AS_STRING(co->co_code);
/* An explanation is in order for the next line.
f->f_lasti now refers to the index of the last instruction
@@ -766,7 +766,7 @@
lltrace = PyDict_GetItemString(f->f_globals, "__lltrace__") != NULL;
#endif
#if defined(Py_DEBUG) || defined(LLTRACE)
- filename = PyString_AsString(co->co_filename);
+ filename = PyBytes_AsString(co->co_filename);
#endif
why = WHY_NOT;
@@ -1147,8 +1147,8 @@
goto slow_add;
x = PyInt_FromLong(i);
}
- else if (PyString_CheckExact(v) &&
- PyString_CheckExact(w)) {
+ else if (PyBytes_CheckExact(v) &&
+ PyBytes_CheckExact(w)) {
x = string_concatenate(v, w, f, next_instr);
/* string_concatenate consumed the ref to v */
goto skip_decref_vx;
@@ -1349,8 +1349,8 @@
goto slow_iadd;
x = PyInt_FromLong(i);
}
- else if (PyString_CheckExact(v) &&
- PyString_CheckExact(w)) {
+ else if (PyBytes_CheckExact(v) &&
+ PyBytes_CheckExact(w)) {
x = string_concatenate(v, w, f, next_instr);
/* string_concatenate consumed the ref to v */
goto skip_decref_v;
@@ -1576,9 +1576,9 @@
err = PyFile_WriteObject(v, w, Py_PRINT_RAW);
if (err == 0) {
/* XXX move into writeobject() ? */
- if (PyString_Check(v)) {
- char *s = PyString_AS_STRING(v);
- Py_ssize_t len = PyString_GET_SIZE(v);
+ if (PyBytes_Check(v)) {
+ char *s = PyBytes_AS_STRING(v);
+ Py_ssize_t len = PyBytes_GET_SIZE(v);
if (len == 0 ||
!isspace(Py_CHARMASK(s[len-1])) ||
s[len-1] == ' ')
@@ -1705,7 +1705,7 @@
retval = POP();
}
else if (PyExceptionClass_Check(v) ||
- PyString_Check(v)) {
+ PyBytes_Check(v)) {
w = POP();
u = POP();
PyErr_Restore(v, w, u);
@@ -1869,11 +1869,11 @@
case LOAD_GLOBAL:
w = GETITEM(names, oparg);
- if (PyString_CheckExact(w)) {
+ if (PyBytes_CheckExact(w)) {
/* Inline the PyDict_GetItem() calls.
WARNING: this is an extreme speed hack.
Do not try this at home. */
- long hash = ((PyStringObject *)w)->ob_shash;
+ long hash = ((PyBytesObject *)w)->ob_shash;
if (hash != -1) {
PyDictObject *d;
PyDictEntry *e;
@@ -2726,7 +2726,7 @@
PyErr_Format(PyExc_TypeError,
"%.200s() takes %s %d "
"%sargument%s (%d given)",
- PyString_AsString(co->co_name),
+ PyBytes_AsString(co->co_name),
defcount ? "at most" : "exactly",
co->co_argcount,
kwcount ? "non-keyword " : "",
@@ -2756,10 +2756,10 @@
PyObject *keyword = kws[2*i];
PyObject *value = kws[2*i + 1];
int j;
- if (keyword == NULL || !PyString_Check(keyword)) {
+ if (keyword == NULL || !PyBytes_Check(keyword)) {
PyErr_Format(PyExc_TypeError,
"%.200s() keywords must be strings",
- PyString_AsString(co->co_name));
+ PyBytes_AsString(co->co_name));
goto fail;
}
/* XXX slow -- speed up using dictionary? */
@@ -2781,8 +2781,8 @@
PyErr_Format(PyExc_TypeError,
"%.200s() got an unexpected "
"keyword argument '%.400s'",
- PyString_AsString(co->co_name),
- PyString_AsString(keyword));
+ PyBytes_AsString(co->co_name),
+ PyBytes_AsString(keyword));
goto fail;
}
PyDict_SetItem(kwdict, keyword, value);
@@ -2793,8 +2793,8 @@
"%.200s() got multiple "
"values for keyword "
"argument '%.400s'",
- PyString_AsString(co->co_name),
- PyString_AsString(keyword));
+ PyBytes_AsString(co->co_name),
+ PyBytes_AsString(keyword));
goto fail;
}
Py_INCREF(value);
@@ -2808,7 +2808,7 @@
PyErr_Format(PyExc_TypeError,
"%.200s() takes %s %d "
"%sargument%s (%d given)",
- PyString_AsString(co->co_name),
+ PyBytes_AsString(co->co_name),
((co->co_flags & CO_VARARGS) ||
defcount) ? "at least"
: "exactly",
@@ -2834,7 +2834,7 @@
if (argcount > 0 || kwcount > 0) {
PyErr_Format(PyExc_TypeError,
"%.200s() takes no arguments (%d given)",
- PyString_AsString(co->co_name),
+ PyBytes_AsString(co->co_name),
argcount + kwcount);
goto fail;
}
@@ -2860,11 +2860,11 @@
list so that we can march over it more efficiently?
*/
for (i = 0; i < PyTuple_GET_SIZE(co->co_cellvars); ++i) {
- cellname = PyString_AS_STRING(
+ cellname = PyBytes_AS_STRING(
PyTuple_GET_ITEM(co->co_cellvars, i));
found = 0;
for (j = 0; j < nargs; j++) {
- argname = PyString_AS_STRING(
+ argname = PyBytes_AS_STRING(
PyTuple_GET_ITEM(co->co_varnames, j));
if (strcmp(cellname, argname) == 0) {
c = PyCell_New(GETLOCAL(j));
@@ -3522,13 +3522,13 @@
if (PyMethod_Check(func))
return PyEval_GetFuncName(PyMethod_GET_FUNCTION(func));
else if (PyFunction_Check(func))
- return PyString_AsString(((PyFunctionObject*)func)->func_name);
+ return PyBytes_AsString(((PyFunctionObject*)func)->func_name);
else if (PyCFunction_Check(func))
return ((PyCFunctionObject*)func)->m_ml->ml_name;
else if (PyClass_Check(func))
- return PyString_AsString(((PyClassObject*)func)->cl_name);
+ return PyBytes_AsString(((PyClassObject*)func)->cl_name);
else if (PyInstance_Check(func)) {
- return PyString_AsString(
+ return PyBytes_AsString(
((PyInstanceObject*)func)->in_class->cl_name);
} else {
return func->ob_type->tp_name;
@@ -3767,7 +3767,7 @@
"for keyword argument '%.200s'",
PyEval_GetFuncName(func),
PyEval_GetFuncDesc(func),
- PyString_AsString(key));
+ PyBytes_AsString(key));
Py_DECREF(key);
Py_DECREF(value);
Py_DECREF(kwdict);
@@ -4086,7 +4086,7 @@
length = PyTuple_Size(w);
for (i = 0; i < length; i += 1) {
PyObject *exc = PyTuple_GET_ITEM(w, i);
- if (PyString_Check(exc)) {
+ if (PyBytes_Check(exc)) {
int ret_val;
ret_val = PyErr_WarnEx(
PyExc_DeprecationWarning,
@@ -4109,7 +4109,7 @@
}
}
else {
- if (PyString_Check(w)) {
+ if (PyBytes_Check(w)) {
int ret_val;
ret_val = PyErr_WarnEx(
PyExc_DeprecationWarning,
@@ -4149,7 +4149,7 @@
if (x == NULL && PyErr_ExceptionMatches(PyExc_AttributeError)) {
PyErr_Format(PyExc_ImportError,
"cannot import name %.230s",
- PyString_AsString(name));
+ PyBytes_AsString(name));
}
return x;
}
@@ -4191,8 +4191,8 @@
break;
}
if (skip_leading_underscores &&
- PyString_Check(name) &&
- PyString_AS_STRING(name)[0] == '_')
+ PyBytes_Check(name) &&
+ PyBytes_AS_STRING(name)[0] == '_')
{
Py_DECREF(name);
continue;
@@ -4251,12 +4251,12 @@
PyObject *ptype, *pvalue, *ptraceback;
PyErr_Fetch(&ptype, &pvalue, &ptraceback);
- if (PyString_Check(pvalue)) {
+ if (PyBytes_Check(pvalue)) {
PyObject *newmsg;
- newmsg = PyString_FromFormat(
+ newmsg = PyBytes_FromFormat(
"Error when calling the metaclass bases\n"
" %s",
- PyString_AS_STRING(pvalue));
+ PyBytes_AS_STRING(pvalue));
if (newmsg != NULL) {
Py_DECREF(pvalue);
pvalue = newmsg;
@@ -4297,7 +4297,7 @@
}
else if (locals == Py_None)
locals = globals;
- if (!PyString_Check(prog) &&
+ if (!PyBytes_Check(prog) &&
!PyUnicode_Check(prog) &&
!PyCode_Check(prog) &&
!PyFile_Check(prog)) {
@@ -4327,7 +4327,7 @@
}
else if (PyFile_Check(prog)) {
FILE *fp = PyFile_AsFile(prog);
- char *name = PyString_AsString(PyFile_Name(prog));
+ char *name = PyBytes_AsString(PyFile_Name(prog));
PyCompilerFlags cf;
if (name == NULL)
return -1;
@@ -4353,7 +4353,7 @@
cf.cf_flags |= PyCF_SOURCE_IS_UTF8;
}
#endif
- if (PyString_AsStringAndSize(prog, &str, NULL))
+ if (PyBytes_AsStringAndSize(prog, &str, NULL))
return -1;
if (PyEval_MergeCompilerFlags(&cf))
v = PyRun_StringFlags(str, Py_file_input, globals,
@@ -4378,7 +4378,7 @@
if (!obj)
return;
- obj_str = PyString_AsString(obj);
+ obj_str = PyBytes_AsString(obj);
if (!obj_str)
return;
@@ -4391,8 +4391,8 @@
{
/* This function implements 'variable += expr' when both arguments
are strings. */
- Py_ssize_t v_len = PyString_GET_SIZE(v);
- Py_ssize_t w_len = PyString_GET_SIZE(w);
+ Py_ssize_t v_len = PyBytes_GET_SIZE(v);
+ Py_ssize_t w_len = PyBytes_GET_SIZE(w);
Py_ssize_t new_len = v_len + w_len;
if (new_len < 0) {
PyErr_SetString(PyExc_OverflowError,
@@ -4441,12 +4441,12 @@
}
}
- if (v->ob_refcnt == 1 && !PyString_CHECK_INTERNED(v)) {
+ if (v->ob_refcnt == 1 && !PyBytes_CHECK_INTERNED(v)) {
/* Now we own the last reference to 'v', so we can resize it
* in-place.
*/
- if (_PyString_Resize(&v, new_len) != 0) {
- /* XXX if _PyString_Resize() fails, 'v' has been
+ if (_PyBytes_Resize(&v, new_len) != 0) {
+ /* XXX if _PyBytes_Resize() fails, 'v' has been
* deallocated so it cannot be put back into
* 'variable'. The MemoryError is raised when there
* is no value in 'variable', which might (very
@@ -4455,13 +4455,13 @@
return NULL;
}
/* copy 'w' into the newly allocated area of 'v' */
- memcpy(PyString_AS_STRING(v) + v_len,
- PyString_AS_STRING(w), w_len);
+ memcpy(PyBytes_AS_STRING(v) + v_len,
+ PyBytes_AS_STRING(w), w_len);
return v;
}
else {
/* When in-place resizing is not an option. */
- PyString_Concat(&v, w);
+ PyBytes_Concat(&v, w);
return v;
}
}