mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-09-02 06:57:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Some changes in preparation of stricter rules about mixing str and bytes.

Browse source
This commit is contained in:
Guido van Rossum 2007-08-27 15:02:28 +00:00
parent ddd25825c8
commit a4b8d1de7c
2 changed files with 14 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Python/bltinmodule.c
View file

@ -403,18 +403,16 @@ source_as_string(PyObject *cmd)
char *str; char *str;
Py_ssize_t size; Py_ssize_t size;
if (!PyObject_CheckReadBuffer(cmd) &&
!PyUnicode_Check(cmd)) {
PyErr_SetString(PyExc_TypeError,
"eval()/exec() arg 1 must be a string, bytes or code object");
return NULL;
}
if (PyUnicode_Check(cmd)) { if (PyUnicode_Check(cmd)) {
cmd = _PyUnicode_AsDefaultEncodedString(cmd, NULL); cmd = _PyUnicode_AsDefaultEncodedString(cmd, NULL);
if (cmd == NULL) if (cmd == NULL)
return NULL; return NULL;
} }
else if (!PyObject_CheckReadBuffer(cmd)) {
PyErr_SetString(PyExc_TypeError,
"eval()/exec() arg 1 must be a string, bytes or code object");
return NULL;
}
if (PyObject_AsReadBuffer(cmd, (const void **)&str, &size) < 0) { if (PyObject_AsReadBuffer(cmd, (const void **)&str, &size) < 0) {
return NULL; return NULL;
} }

11
Python/import.c
View file

@ -1247,8 +1247,15 @@ find_module(char *fullname, char *subname, PyObject *path, char *buf,
Py_ssize_t size; Py_ssize_t size;
if (!v) if (!v)
return NULL; return NULL;
if (PyObject_AsCharBuffer(v, &base, &size) < 0) if (PyUnicode_Check(v)) {
return NULL; v = _PyUnicode_AsDefaultEncodedString(v, NULL);
if (v == NULL)
return NULL;
}
if (!PyString_Check(v))
continue;
base = PyString_AS_STRING(v);
size = PyString_GET_SIZE(v);
len = size; len = size;
if (len + 2 + namelen + MAXSUFFIXSIZE >= buflen) { if (len + 2 + namelen + MAXSUFFIXSIZE >= buflen) {
continue; /* Too long */ continue; /* Too long */