diff options
| author | Raymond Hettinger <python@rcn.com> | 2011-03-31 13:59:52 -0700 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2011-03-31 13:59:52 -0700 |
| commit | d5ce71786a2851c4abc1ab9c80ab36cc39020723 (patch) | |
| tree | 720a41b1787661f68f707cda7d61ac785ae3e1eb /Python/ceval.c | |
| parent | 50beeaddfcfb07654466431ab9605267707fbe06 (diff) | |
| parent | d2b0fe9b2b6abb9b60c0206526ef6f7f2c6b9236 (diff) | |
| download | cpython-d5ce71786a2851c4abc1ab9c80ab36cc39020723.tar.gz | |
Fix markup and wording.
Diffstat (limited to 'Python/ceval.c')
| -rw-r--r-- | Python/ceval.c | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index 43a5c904d1..50d5aacd9e 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; */ } } } @@ -4146,7 +4130,7 @@ ext_do_call(PyObject *func, PyObject ***pp_stack, int flags, int na, int nk) if (PyErr_ExceptionMatches(PyExc_TypeError)) { PyErr_Format(PyExc_TypeError, "%.200s%.200s argument after * " - "must be a sequence, not %200s", + "must be a sequence, not %.200s", PyEval_GetFuncName(func), PyEval_GetFuncDesc(func), stararg->ob_type->tp_name); |