commit d020c8921e201d41409cf452f2ae0acd42d16494
author Bhavani Iyer <bhavani@apache.org> Thu Jul 12 17:24:07 2012 +0000
committer Bhavani Iyer <bhavani@apache.org> Thu Jul 12 17:24:07 2012 +0000
tree 99abcfc64d1532b33b1fce619c1538a8d001eee0
parent fb8fed7b3cf7430addfeb07e2f73f90adb13e31f

UIMA-2433 Updated for newer version of python

git-svn-id: https://svn.apache.org/repos/asf/uima/uimacpp/trunk@1360823 13f79535-47bb-0310-9956-ffa450edef68

scriptators/uima.i

diff --git a/scriptators/uima.i b/scriptators/uima.i
index e502a02..1d78bb3 100644
--- a/scriptators/uima.i
+++ b/scriptators/uima.i
@@ -68,8 +68,18 @@
 static bool PyStringConvert(PyObject *obj, UnicodeString &rv) {
   char *src;
   int len;
-  //Py_ssize_t len;
-  PyString_AsStringAndSize(obj, &src, &len);
+  #ifdef PY_VERSION_HEX
+  #if (PY_VERSION_HEX >= 0x02050000)
+    /* Python version was greater than 2.5 */
+     PyString_AsStringAndSize(obj, &src,  ( Py_ssize_t*)&len);
+  #else
+    /* Python version was less than 2.5 */
+     PyString_AsStringAndSize(obj, &src, &len);
+  #endif
+  #else
+    /* Could not determine version */ 
+    PyString_AsStringAndSize(obj, &src, &len);
+  #endif
   rv = UnicodeString((const char *) src, (int32_t) len);
   return true;
 }