diff options
| author | Benjamin Peterson <benjamin@python.org> | 2011-10-19 20:57:40 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2011-10-19 20:57:40 (GMT) |
| commit | 9d9141f5db7e7386f8f6480c03d4548dea2182fa (patch) | |
| tree | 3d1e272c8aeac54e19d6b4f78859a94f20d7a6d7 /Objects | |
| parent | 34d38dce11cecde871c26cdf344ab5169c2cb9db (diff) | |
| download | cpython-9d9141f5db7e7386f8f6480c03d4548dea2182fa.zip cpython-9d9141f5db7e7386f8f6480c03d4548dea2182fa.tar.gz cpython-9d9141f5db7e7386f8f6480c03d4548dea2182fa.tar.bz2 | |
adjust braces a bit
Diffstat (limited to 'Objects')
| -rw-r--r-- | Objects/genobject.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/Objects/genobject.c b/Objects/genobject.c index 49e2ade..42608ef 100644 --- a/Objects/genobject.c +++ b/Objects/genobject.c @@ -232,8 +232,9 @@ gen_throw(PyGenObject *gen, PyObject *args) /* First, check the traceback argument, replacing None with NULL. */ - if (tb == Py_None) + if (tb == Py_None) { tb = NULL; + } else if (tb != NULL && !PyTraceBack_Check(tb)) { PyErr_SetString(PyExc_TypeError, "throw() third argument must be a traceback object"); @@ -244,9 +245,8 @@ gen_throw(PyGenObject *gen, PyObject *args) Py_XINCREF(val); Py_XINCREF(tb); - if (PyExceptionClass_Check(typ)) { + if (PyExceptionClass_Check(typ)) PyErr_NormalizeException(&typ, &val, &tb); - } else if (PyExceptionInstance_Check(typ)) { /* Raising an instance. The value should be a dummy. */ @@ -262,10 +262,9 @@ gen_throw(PyGenObject *gen, PyObject *args) typ = PyExceptionInstance_Class(typ); Py_INCREF(typ); - if (tb == NULL) { + if (tb == NULL) /* Returns NULL if there's no traceback */ tb = PyException_GetTraceback(val); - } } } else { |