diff options
| author | Felix Domke <tmbinc@elitedvb.net> | 2009-01-27 15:57:27 +0100 |
|---|---|---|
| committer | Felix Domke <tmbinc@elitedvb.net> | 2009-01-27 15:57:27 +0100 |
| commit | 09f66522e9f51ac8fc7921bd77ba36a9d9d3d4b3 (patch) | |
| tree | 2e29b0fe36b64ab79be719c03c8e25ba82398f7d /lib/dvb/epgcache.cpp | |
| parent | fc102394e60824f5c07da710d36ba28eaf160c72 (diff) | |
| parent | e5423277b5d9dd89918a9b123c10d31057b3dc52 (diff) | |
| download | enigma2-09f66522e9f51ac8fc7921bd77ba36a9d9d3d4b3.tar.gz enigma2-09f66522e9f51ac8fc7921bd77ba36a9d9d3d4b3.zip | |
Merge branch 'master' of git.opendreambox.org:/git/enigma2
Diffstat (limited to 'lib/dvb/epgcache.cpp')
| -rw-r--r-- | lib/dvb/epgcache.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/lib/dvb/epgcache.cpp b/lib/dvb/epgcache.cpp index a8eca85b..fdcbe0e9 100644 --- a/lib/dvb/epgcache.cpp +++ b/lib/dvb/epgcache.cpp @@ -2058,7 +2058,11 @@ PyObject *eEPGCache::search(ePyObject arg) ePyObject obj = PyTuple_GET_ITEM(arg,0); if (PyString_Check(obj)) { +#if PY_VERSION_HEX < 0x02060000 argcount = PyString_GET_SIZE(obj); +#else + argcount = PyString_Size(obj); +#endif argstring = PyString_AS_STRING(obj); for (int i=0; i < argcount; ++i) switch(argstring[i]) @@ -2156,7 +2160,11 @@ PyObject *eEPGCache::search(ePyObject arg) { int casetype = PyLong_AsLong(PyTuple_GET_ITEM(arg, 4)); const char *str = PyString_AS_STRING(obj); +#if PY_VERSION_HEX < 0x02060000 int textlen = PyString_GET_SIZE(obj); +#else + int textlen = PyString_Size(obj); +#endif if (querytype == 1) eDebug("lookup for events with '%s' as title(%s)", str, casetype?"ignore case":"case sensitive"); else |