mirror of https://github.com/python/cpython
Make these files to compile again under Windows.
This commit is contained in:
parent
0d755b4e2b
commit
d88ddfa94a
|
@ -1340,9 +1340,10 @@ print_exception(PyObject *f, PyObject *value)
|
||||||
/* Don't do anything else */
|
/* Don't do anything else */
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
assert(PyExceptionClass_Check(type));
|
|
||||||
PyObject* moduleName;
|
PyObject* moduleName;
|
||||||
char* className = PyExceptionClass_Name(type);
|
char* className;
|
||||||
|
assert(PyExceptionClass_Check(type));
|
||||||
|
className = PyExceptionClass_Name(type);
|
||||||
if (className != NULL) {
|
if (className != NULL) {
|
||||||
char *dot = strrchr(className, '.');
|
char *dot = strrchr(className, '.');
|
||||||
if (dot != NULL)
|
if (dot != NULL)
|
||||||
|
|
|
@ -616,6 +616,7 @@ sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds)
|
||||||
static PyObject *str__sizeof__, *gc_head_size = NULL;
|
static PyObject *str__sizeof__, *gc_head_size = NULL;
|
||||||
static char *kwlist[] = {"object", "default", 0};
|
static char *kwlist[] = {"object", "default", 0};
|
||||||
PyObject *o, *dflt = NULL;
|
PyObject *o, *dflt = NULL;
|
||||||
|
PyObject *method;
|
||||||
|
|
||||||
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:getsizeof",
|
if (!PyArg_ParseTupleAndKeywords(args, kwds, "O|O:getsizeof",
|
||||||
kwlist, &o, &dflt))
|
kwlist, &o, &dflt))
|
||||||
|
@ -639,7 +640,7 @@ sys_getsizeof(PyObject *self, PyObject *args, PyObject *kwds)
|
||||||
if (PyType_Ready(Py_TYPE(o)) < 0)
|
if (PyType_Ready(Py_TYPE(o)) < 0)
|
||||||
return NULL;
|
return NULL;
|
||||||
|
|
||||||
PyObject *method = _PyType_Lookup(Py_TYPE(o), str__sizeof__);
|
method = _PyType_Lookup(Py_TYPE(o), str__sizeof__);
|
||||||
if (method == NULL)
|
if (method == NULL)
|
||||||
PyErr_Format(PyExc_TypeError,
|
PyErr_Format(PyExc_TypeError,
|
||||||
"Type %.100s doesn't define __sizeof__",
|
"Type %.100s doesn't define __sizeof__",
|
||||||
|
|
Loading…
Reference in New Issue