diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-11 15:02:40 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-01-11 15:03:08 +0000 |
| commit | 50fa5eb54992c28d63b0532533f755ff39f082e2 (patch) | |
| tree | 7cd4c93e490187bd0da34d9475f93e8aa88deec5 /_dbus_bindings/bytes.c | |
| parent | 4f043cf34a8001c071644eb8c89dc7d43e86b62a (diff) | |
| download | dbus-python-50fa5eb54992c28d63b0532533f755ff39f082e2.tar.gz | |
Add INTORLONG_CHECK macro so we don't have to conditionalize PyInt_Check
Diffstat (limited to '_dbus_bindings/bytes.c')
| -rw-r--r-- | _dbus_bindings/bytes.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/_dbus_bindings/bytes.c b/_dbus_bindings/bytes.c index 9914319..fc490d9 100644 --- a/_dbus_bindings/bytes.c +++ b/_dbus_bindings/bytes.c @@ -96,12 +96,8 @@ Byte_new(PyTypeObject *cls, PyObject *args, PyObject *kwargs) if (!obj) goto bad_arg; } - else if (PyLong_Check(obj) -#ifndef PY3 - || PyInt_Check(obj) -#endif - ) - { + else if (INTORLONG_CHECK(obj)) { + /* on Python 2 this accepts either int or long */ long i = PyLong_AsLong(obj); long my_variant_level; |