diff options
| author | Benjamin Peterson <benjamin@python.org> | 2009-02-21 23:14:55 (GMT) |
|---|---|---|
| committer | Benjamin Peterson <benjamin@python.org> | 2009-02-21 23:14:55 (GMT) |
| commit | 912fbcade3789b6a3dff75f46e564bbe74d0c20b (patch) | |
| tree | 750de063b56e4611facd4070e0fc689cfa1020c5 | |
| parent | 94aaf9e4b81ee1be6ea4e6604bac61eaeab53d2b (diff) | |
| download | cpython-912fbcade3789b6a3dff75f46e564bbe74d0c20b.zip cpython-912fbcade3789b6a3dff75f46e564bbe74d0c20b.tar.gz cpython-912fbcade3789b6a3dff75f46e564bbe74d0c20b.tar.bz2 | |
Merged revisions 69855 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r69855 | benjamin.peterson | 2009-02-21 17:09:33 -0600 (Sat, 21 Feb 2009) | 1 line
fix compiler warnings
........
| -rw-r--r-- | Modules/itertoolsmodule.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Modules/itertoolsmodule.c b/Modules/itertoolsmodule.c index 62e8f5c..f1e76e2 100644 --- a/Modules/itertoolsmodule.c +++ b/Modules/itertoolsmodule.c @@ -2923,15 +2923,15 @@ count_new(PyTypeObject *type, PyObject *args, PyObject *kwds) kwlist, &long_cnt, &long_step)) return NULL; - if (long_cnt != NULL && !PyNumber_Check(long_cnt) || - long_step != NULL && !PyNumber_Check(long_step)) { + if ((long_cnt != NULL && !PyNumber_Check(long_cnt)) || + (long_step != NULL && !PyNumber_Check(long_step))) { PyErr_SetString(PyExc_TypeError, "a number is required"); return NULL; } if (long_cnt != NULL) { cnt = PyLong_AsSsize_t(long_cnt); - if (cnt == -1 && PyErr_Occurred() || !PyLong_Check(long_cnt)) { + if ((cnt == -1 && PyErr_Occurred()) || !PyLong_Check(long_cnt)) { PyErr_Clear(); slow_mode = 1; } @@ -2964,10 +2964,10 @@ count_new(PyTypeObject *type, PyObject *args, PyObject *kwds) else Py_CLEAR(long_cnt); - assert(cnt != PY_SSIZE_T_MAX && long_cnt == NULL && !slow_mode || - cnt == PY_SSIZE_T_MAX && long_cnt != NULL && slow_mode); + assert((cnt != PY_SSIZE_T_MAX && long_cnt == NULL && !slow_mode) || + (cnt == PY_SSIZE_T_MAX && long_cnt != NULL && slow_mode)); assert(slow_mode || - PyLong_Check(long_step) && PyLong_AS_LONG(long_step) == 1); + (PyLong_Check(long_step) && PyLong_AS_LONG(long_step) == 1)); /* create countobject structure */ lz = (countobject *)type->tp_alloc(type, 0); |