diff options
| author | R David Murray <rdmurray@bitdance.com> | 2011-03-14 21:14:53 -0400 |
|---|---|---|
| committer | R David Murray <rdmurray@bitdance.com> | 2011-03-14 21:14:53 -0400 |
| commit | eba3adb8c547317bb259a27be2dc6b0af2f467af (patch) | |
| tree | 2fd1b6de9a90d37d2c473ad5ef9df7fe0cbdb70e /Python/ceval.c | |
| parent | 645f312bebd576c855073c4ecc06a0673614f227 (diff) | |
| parent | 36d507533d39b10591431beb91102e5da812d07b (diff) | |
| download | cpython-eba3adb8c547317bb259a27be2dc6b0af2f467af.tar.gz | |
Merge long Japanese header fix from 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 f6d4b0b84b..9572918dc3 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; */ } } } |