diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-11-15 16:23:50 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2011-11-15 16:32:16 +0000 |
| commit | 092f60d1887a907434fb34e3a8841b067c21a01e (patch) | |
| tree | a9242b1d1950b777b48fd7d51770f504a6a72dec | |
| parent | dfa62b24adde8666df4d9cf64569d3aa51063ac8 (diff) | |
| download | dbus-python-092f60d1887a907434fb34e3a8841b067c21a01e.tar.gz | |
Remove support for Python < 2.5
| -rw-r--r-- | _dbus_bindings/dbus_bindings-internal.h | 7 | ||||
| -rw-r--r-- | _dbus_bindings/module.c | 10 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 1 insertions, 18 deletions
diff --git a/_dbus_bindings/dbus_bindings-internal.h b/_dbus_bindings/dbus_bindings-internal.h index 3b15706..f137fe9 100644 --- a/_dbus_bindings/dbus_bindings-internal.h +++ b/_dbus_bindings/dbus_bindings-internal.h @@ -30,13 +30,6 @@ #include <Python.h> -/* Python < 2.5 compat */ -#if PY_VERSION_HEX < 0x02050000 && !defined(PY_SSIZE_T_MIN) -typedef int Py_ssize_t; -#define PY_SSIZE_T_MAX INT_MAX -#define PY_SSIZE_T_MIN INT_MIN -#endif - #define INSIDE_DBUS_PYTHON_BINDINGS #include "dbus-python.h" diff --git a/_dbus_bindings/module.c b/_dbus_bindings/module.c index 6a8e455..f6fca5f 100644 --- a/_dbus_bindings/module.c +++ b/_dbus_bindings/module.c @@ -246,16 +246,6 @@ init_dbus_bindings(void) default_main_loop = NULL; - /* I'd rather not initialize threads if we can help it - dbus-python and - pygobject both release and re-obtain the GIL on a regular basis, which is - much simpler (basically free) before threads are initialized. - - However, on Python < 2.4.2c1 you aren't allowed to call - PyGILState_Release without initializing threads first. */ - if (strcmp(Py_GetVersion(), "2.4.2c1") < 0) { - PyEval_InitThreads(); - } - if (!dbus_py_init_generic()) return; if (!dbus_py_init_abstract()) return; if (!dbus_py_init_signature()) return; diff --git a/configure.ac b/configure.ac index b096502..e37bc2d 100644 --- a/configure.ac +++ b/configure.ac @@ -46,7 +46,7 @@ m4_define([_LT_AC_TAGCONFIG],[]) AC_PROG_LIBTOOL AM_PROG_CC_C_O -AM_PATH_PYTHON(2.4.0) +AM_PATH_PYTHON([2.5]) AM_CHECK_PYTHON_HEADERS(,[AC_MSG_ERROR(could not find Python headers)]) |