diff options
| author | Florent Xicluna <florent.xicluna@gmail.com> | 2011-12-12 17:54:29 (GMT) |
|---|---|---|
| committer | Florent Xicluna <florent.xicluna@gmail.com> | 2011-12-12 17:54:29 (GMT) |
| commit | aa6c1d240fc4dd883b4c5a1564182e8fa90de496 (patch) | |
| tree | 417976ca1ed9205f4dd9fc19768dfd93afff632a /Python | |
| parent | 9d57481f043cb9b94bfc45c1ee041415d915cf8a (diff) | |
| download | cpython-aa6c1d240fc4dd883b4c5a1564182e8fa90de496.zip cpython-aa6c1d240fc4dd883b4c5a1564182e8fa90de496.tar.gz cpython-aa6c1d240fc4dd883b4c5a1564182e8fa90de496.tar.bz2 | |
Issue #13575: there is only one class type.
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/errors.c | 2 | ||||
| -rw-r--r-- | Python/pythonrun.c | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/Python/errors.c b/Python/errors.c index cd0f68d..36b8c54 100644 --- a/Python/errors.c +++ b/Python/errors.c @@ -665,7 +665,7 @@ PyErr_NewException(const char *name, PyObject *base, PyObject *dict) if (bases == NULL) goto failure; } - /* Create a real new-style class. */ + /* Create a real class. */ result = PyObject_CallFunction((PyObject *)&PyType_Type, "sOO", dot+1, bases, dict); failure: diff --git a/Python/pythonrun.c b/Python/pythonrun.c index abc9ffc..c8d1e90 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -474,7 +474,7 @@ Py_Finalize(void) flush_std_files(); /* Collect final garbage. This disposes of cycles created by - * new-style class definitions, for example. + * class definitions, for example. * XXX This is disabled because it caused too many problems. If * XXX a __del__ or weakref callback triggers here, Python code has * XXX a hard time running, because even the sys module has been @@ -1348,11 +1348,6 @@ parse_syntax_error(PyObject *err, PyObject **message, const char **filename, _Py_IDENTIFIER(offset); _Py_IDENTIFIER(text); - /* old style errors */ - if (PyTuple_Check(err)) - return PyArg_ParseTuple(err, "O(ziiz)", message, filename, - lineno, offset, text); - /* new style errors. `err' is an instance */ if (! (v = _PyObject_GetAttrId(err, &PyId_msg))) |