diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 11:38:59 +0200 |
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2011-03-16 11:38:59 +0200 |
| commit | 824ead71ff37bbf9ba57674f2bf6cc4cf9f92a70 (patch) | |
| tree | 1dd1a1f8864bb4ea4da86e403e0a0c3a4b74c14d /Python/ceval.c | |
| parent | a8fef3700df5400004ac88fa20c8bb4ff6f44ca3 (diff) | |
| parent | fd20eca68b680d81b45ec4ce421d1d942dd29c1b (diff) | |
| download | cpython-824ead71ff37bbf9ba57674f2bf6cc4cf9f92a70.tar.gz | |
#11565: Merge with 3.2.
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 43a5c904d1..d2444aa9f0 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -811,10 +811,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) unsigned char *first_instr; PyObject *names; PyObject *consts; -#if defined(Py_DEBUG) || defined(LLTRACE) - /* Make it easier to find out where we are with a debugger */ - char *filename; -#endif /* Computed GOTOs, or the-optimization-commonly-but-improperly-known-as-"threaded code" @@ -1227,18 +1223,6 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) #ifdef LLTRACE lltrace = PyDict_GetItemString(f->f_globals, "__lltrace__") != NULL; #endif -#if defined(Py_DEBUG) || defined(LLTRACE) - { - PyObject *error_type, *error_value, *error_traceback; - PyErr_Fetch(&error_type, &error_value, &error_traceback); - filename = _PyUnicode_AsString(co->co_filename); - if (filename == NULL && tstate->overflowed) { - /* maximum recursion depth exceeded */ - goto exit_eval_frame; - } - PyErr_Restore(error_type, error_value, error_traceback); - } -#endif why = WHY_NOT; err = 0; @@ -2706,7 +2690,7 @@ PyEval_EvalFrameEx(PyFrameObject *f, int throwflag) Py_DECREF(*pfunc); *pfunc = self; na++; - n++; + /* n++; */ } else Py_INCREF(func); sp = stack_pointer; @@ -3042,7 +3026,7 @@ fast_yield: PyTrace_RETURN, retval)) { Py_XDECREF(retval); retval = NULL; - why = WHY_EXCEPTION; + /* why = WHY_EXCEPTION; */ } } } |