Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2AD57200C37 for ; Sun, 19 Mar 2017 21:26:54 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 295A1160B8E; Sun, 19 Mar 2017 20:26:54 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 0705D160B7D for ; Sun, 19 Mar 2017 21:26:51 +0100 (CET) Received: (qmail 26965 invoked by uid 500); 19 Mar 2017 20:26:51 -0000 Mailing-List: contact pylucene-commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: pylucene-dev@lucene.apache.org Delivered-To: mailing list pylucene-commits@lucene.apache.org Received: (qmail 26947 invoked by uid 99); 19 Mar 2017 20:26:51 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 19 Mar 2017 20:26:51 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id 32FC23A1C25 for ; Sun, 19 Mar 2017 20:26:50 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1787656 [2/2] - in /lucene/pylucene/trunk/jcc: ./ _jcc/ _jcc2/ _jcc3/ _jcc3/java/lang/ _jcc3/java/lang/reflect/ helpers/ helpers2/ helpers3/ jcc/ jcc2/ jcc3/ jcc3/sources/ Date: Sun, 19 Mar 2017 20:26:49 -0000 To: pylucene-commits@lucene.apache.org From: vajda@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170319202650.32FC23A1C25@svn01-us-west.apache.org> archived-at: Sun, 19 Mar 2017 20:26:54 -0000 Modified: lucene/pylucene/trunk/jcc/jcc3/sources/JCCEnv.cpp URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/sources/JCCEnv.cpp?rev=1787656&r1=1759171&r2=1787656&view=diff ============================================================================== --- lucene/pylucene/trunk/jcc/jcc3/sources/JCCEnv.cpp (original) +++ lucene/pylucene/trunk/jcc/jcc3/sources/JCCEnv.cpp Sun Mar 19 20:26:48 2017 @@ -18,6 +18,8 @@ #include #include +#include + #include "JCCEnv.h" #if defined(_MSC_VER) || defined(__WIN32) @@ -56,6 +58,25 @@ public: #endif +// borrowed from ICU (http://icu-project.org/apiref/icu4c/utf16_8h.html) +#define U16_LEAD(c) (jchar) (((c) >> 10) + 0xd7c0) +#define U16_TRAIL(c) (jchar) (((c) & 0x3ff) | 0xdc00) +#define U16_IS_LEAD(c) (((c) & 0xfffffc00) == 0xd800) +#define U16_IS_TRAIL(c) (((c) & 0xfffffc00) == 0xdc00) +#define U16_SURROGATE_OFFSET ((0xd800 << 10UL) + 0xdc00 - 0x10000) +#define U16_GET_SUPPLEMENTARY(lead, trail) \ + (((uint32_t) (lead) << 10UL) + (uint32_t) (trail) - U16_SURROGATE_OFFSET) +#define U16_NEXT(s, i, length, c) { \ + (c) = (s)[(i)++]; \ + if (U16_IS_LEAD(c)) { \ + jchar __c2; \ + if ((i) != (length) && U16_IS_TRAIL(__c2 = (s)[(i)])) { \ + ++(i); \ + (c) = U16_GET_SUPPLEMENTARY((c), __c2); \ + } \ + } \ +} + JCCEnv::JCCEnv(JavaVM *vm, JNIEnv *vm_env) { #if defined(_MSC_VER) || defined(__WIN32) @@ -904,7 +925,7 @@ char *JCCEnv::getClassPath() int count = array ? vm_env->GetArrayLength(array) : 0; int first = 1, total = 0; char *classpath = NULL; - + for (int i = 0; i < count; i++) { jobject url = vm_env->GetObjectArrayElement(array, i); jstring path = (jstring) vm_env->CallObjectMethod(url, gp); @@ -930,7 +951,7 @@ char *JCCEnv::getClassPath() return classpath; } -jstring JCCEnv::fromUTF(const char *bytes) const +jstring JCCEnv::fromUTF8(const char *bytes) const { jstring str = get_vm_env()->NewStringUTF(bytes); @@ -939,11 +960,35 @@ jstring JCCEnv::fromUTF(const char *byte return str; } -char *JCCEnv::toUTF(jstring str) const +jstring JCCEnv::fromUTF32(const uint32_t *chars, jsize len) const +{ + std::vector jchars; + + for (jsize i = 0; i < len; ++i) { + uint32_t c = chars[i]; + + if (c <= 0xd7ff || (c >= 0xe000 && c <= 0xffff)) { + jchars.push_back((jchar) c); + } else if (c >= 0x10000 && c <= 0x10fff) { + jchars.push_back(U16_LEAD(c)); + jchars.push_back(U16_TRAIL(c)); + } else if (c >= 0xd800 && c <= 0xdfff) { + jchars.push_back((jchar) 0xfffd); // invalid char + } + } + + jstring str = get_vm_env()->NewString(jchars.data(), jchars.size()); + + reportException(); + + return str; +} + +char *JCCEnv::toUTF8(jstring str) const { JNIEnv *vm_env = get_vm_env(); int len = vm_env->GetStringUTFLength(str); - char *bytes = new char[len + 1]; + char *bytes = (char *) malloc(len + 1); jboolean isCopy = 0; const char *utf = vm_env->GetStringUTFChars(str, &isCopy); @@ -962,7 +1007,7 @@ char *JCCEnv::toString(jobject obj) cons { try { return obj - ? toUTF((jstring) callObjectMethod(obj, _mids[mid_obj_toString])) + ? toUTF8((jstring) callObjectMethod(obj, _mids[mid_obj_toString])) : NULL; } catch (int e) { switch (e) { @@ -998,40 +1043,54 @@ jstring JCCEnv::fromPyString(PyObject *o if (PyUnicode_Check(object)) { - if (sizeof(Py_UNICODE) == sizeof(jchar)) - { - jchar *buf = (jchar *) PyUnicode_AS_UNICODE(object); - jsize len = (jsize) PyUnicode_GET_SIZE(object); + PyUnicode_READY(object); - return get_vm_env()->NewString(buf, len); - } - else - { - jsize len = PyUnicode_GET_SIZE(object); - Py_UNICODE *pchars = PyUnicode_AS_UNICODE(object); - jchar *jchars = new jchar[len]; - jstring str; + switch (PyUnicode_KIND(object)) { + case PyUnicode_WCHAR_KIND: { // this code path should be deprecated + if (sizeof(Py_UNICODE) == sizeof(jchar)) + { + Py_ssize_t len; + Py_UNICODE *pchars = PyUnicode_AsUnicodeAndSize(object, &len); + + return get_vm_env()->NewString((jchar *) pchars, (jsize) len); + } + else // Py_UNICODE 32-bit case + { + Py_ssize_t len; + Py_UNICODE *pchars = PyUnicode_AsUnicodeAndSize(object, &len); + + return fromUTF32((uint32_t *) pchars, (jsize) len); + } + } + + case PyUnicode_1BYTE_KIND: + return fromUTF8((const char *) PyUnicode_1BYTE_DATA(object)); - for (int i = 0; i < len; i++) - jchars[i] = (jchar) pchars[i]; + case PyUnicode_2BYTE_KIND: { + Py_ssize_t len = PyUnicode_GET_LENGTH(object); + Py_UCS2 *pchars = PyUnicode_2BYTE_DATA(object); - str = get_vm_env()->NewString(jchars, len); - delete[] jchars; + return get_vm_env()->NewString((jchar *) pchars, (jsize) len); + } - return str; + case PyUnicode_4BYTE_KIND: { + Py_ssize_t len = PyUnicode_GET_LENGTH(object); + Py_UCS4 *pchars = PyUnicode_4BYTE_DATA(object); + + return fromUTF32((uint32_t *) pchars, (jsize) len); + } } } - else if (PyString_Check(object)) - return fromUTF(PyString_AS_STRING(object)); - else - { - PyObject *tuple = Py_BuildValue("(sO)", "expected a string", object); + else if (PyBytes_Check(object)) + return fromUTF8(PyBytes_AS_STRING(object)); - PyErr_SetObject(PyExc_TypeError, tuple); - Py_DECREF(tuple); - return NULL; - } + PyObject *tuple = Py_BuildValue("(sO)", "expected a string", object); + + PyErr_SetObject(PyExc_TypeError, tuple); + Py_DECREF(tuple); + + return NULL; } PyObject *JCCEnv::fromJString(jstring js, int delete_local_ref) const @@ -1040,39 +1099,61 @@ PyObject *JCCEnv::fromJString(jstring js Py_RETURN_NONE; JNIEnv *vm_env = get_vm_env(); - PyObject *string; + jsize len16 = vm_env->GetStringLength(js); + jboolean isCopy; + const jchar *utf16 = vm_env->GetStringChars(js, &isCopy); - if (sizeof(Py_UNICODE) == sizeof(jchar)) - { - jboolean isCopy; - const jchar *buf = vm_env->GetStringChars(js, &isCopy); - jsize len = vm_env->GetStringLength(js); + int32_t len32 = 0; + uint32_t max_char = 0; + + for (jsize i = 0; i < len16;) { + uint32_t cp; - string = PyUnicode_FromUnicode((const Py_UNICODE *) buf, len); - vm_env->ReleaseStringChars(js, buf); + U16_NEXT(utf16, i, len16, cp); + max_char |= cp; // we only care about the leftmost bit + len32 += 1; } - else - { - jsize len = vm_env->GetStringLength(js); - string = PyUnicode_FromUnicode(NULL, len); - if (string) - { - jboolean isCopy; - const jchar *jchars = vm_env->GetStringChars(js, &isCopy); - Py_UNICODE *pchars = PyUnicode_AS_UNICODE(string); + PyObject *result = PyUnicode_New(len32, max_char); - for (int i = 0; i < len; i++) - pchars[i] = (Py_UNICODE) jchars[i]; - - vm_env->ReleaseStringChars(js, jchars); - } + if (result == NULL) { + vm_env->ReleaseStringChars(js, utf16); + return NULL; } + switch (PyUnicode_KIND(result)) { + case PyUnicode_1BYTE_KIND: + // note: len16 == len32 + for (int32_t i = 0; i < len32; ++i) + PyUnicode_1BYTE_DATA(result)[i] = (Py_UCS1) (utf16[i]); + break; + + case PyUnicode_2BYTE_KIND: + // note: len16 == len32 + memcpy(PyUnicode_2BYTE_DATA(result), utf16, len16 * 2); + break; + + case PyUnicode_4BYTE_KIND: + len32 = 0; + for (jsize i = 0; i < len16;) { + uint32_t cp; + + U16_NEXT(utf16, i, len16, cp); + PyUnicode_4BYTE_DATA(result)[len32++] = cp; + } + break; + + default: + Py_DECREF(result); + vm_env->ReleaseStringChars(js, utf16); + return NULL; + } + + vm_env->ReleaseStringChars(js, utf16); if (delete_local_ref) vm_env->DeleteLocalRef((jobject) js); - return string; + return result; } Modified: lucene/pylucene/trunk/jcc/jcc3/sources/JCCEnv.h URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/sources/JCCEnv.h?rev=1787656&r1=1759171&r2=1787656&view=diff ============================================================================== --- lucene/pylucene/trunk/jcc/jcc3/sources/JCCEnv.h (original) +++ lucene/pylucene/trunk/jcc/jcc3/sources/JCCEnv.h Sun Mar 19 20:26:48 2017 @@ -18,6 +18,7 @@ #define _JCCEnv_H #include +#include #if defined(_MSC_VER) || defined(__WIN32) #define _DLL_IMPORT __declspec(dllimport) #define _DLL_EXPORT __declspec(dllexport) @@ -279,8 +280,9 @@ public: void setClassPath(const char *classPath); char *getClassPath(); - jstring fromUTF(const char *bytes) const; - char *toUTF(jstring str) const; + jstring fromUTF8(const char *bytes) const; + jstring fromUTF32(const uint32_t *chars, jsize len) const; + char *toUTF8(jstring str) const; char *toString(jobject obj) const; char *getClassName(jobject obj) const; #ifdef PYTHON Modified: lucene/pylucene/trunk/jcc/jcc3/sources/JObject.cpp URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/sources/JObject.cpp?rev=1787656&r1=1759171&r2=1787656&view=diff ============================================================================== --- lucene/pylucene/trunk/jcc/jcc3/sources/JObject.cpp (original) +++ lucene/pylucene/trunk/jcc/jcc3/sources/JObject.cpp Sun Mar 19 20:26:48 2017 @@ -50,8 +50,7 @@ static PyGetSetDef t_JObject_properties[ }; PyTypeObject PY_TYPE(JObject) = { - PyObject_HEAD_INIT(NULL) - 0, /* ob_size */ + PyVarObject_HEAD_INIT(NULL, 0) "jcc.JObject", /* tp_name */ sizeof(t_JObject), /* tp_basicsize */ 0, /* tp_itemsize */ @@ -59,7 +58,7 @@ PyTypeObject PY_TYPE(JObject) = { 0, /* tp_print */ 0, /* tp_getattr */ 0, /* tp_setattr */ - 0, /* tp_compare */ + 0, /* tp_reserved */ (reprfunc)t_JObject_repr, /* tp_repr */ 0, /* tp_as_number */ 0, /* tp_as_sequence */ @@ -96,7 +95,7 @@ PyTypeObject PY_TYPE(JObject) = { static void t_JObject_dealloc(t_JObject *self) { self->object = JObject(NULL); - self->ob_type->tp_free((PyObject *) self); + self->ob_base.ob_type->tp_free((PyObject *) self); } static PyObject *t_JObject_new(PyTypeObject *type, @@ -152,26 +151,22 @@ static PyObject *t_JObject_str(t_JObject PyObject *unicode = PyUnicode_DecodeUTF8(utf, strlen(utf), "strict"); - delete utf; + free(utf); return unicode; } } - return PyString_FromString(""); + return PyUnicode_FromString(""); } static PyObject *t_JObject_repr(t_JObject *self) { - PyObject *name = PyObject_GetAttrString((PyObject *) self->ob_type, + PyObject *name = PyObject_GetAttrString((PyObject *) self->ob_base.ob_type, "__name__"); - PyObject *str = self->ob_type->tp_str((PyObject *) self); -#if PY_VERSION_HEX < 0x02040000 - PyObject *args = Py_BuildValue("(OO)", name, str); -#else + PyObject *str = self->ob_base.ob_type->tp_str((PyObject *) self); PyObject *args = PyTuple_Pack(2, name, str); -#endif - PyObject *format = PyString_FromString("<%s: %s>"); - PyObject *repr = PyString_Format(format, args); + PyObject *format = PyUnicode_FromString("<%s: %s>"); + PyObject *repr = PyUnicode_Format(format, args); Py_DECREF(name); Py_DECREF(str); @@ -188,7 +183,7 @@ static int t_JObject_hash(t_JObject *sel static PyObject *t_JObject__getJObject(t_JObject *self, void *data) { - return PyCObject_FromVoidPtr((void *) self->object.this$, NULL); + return PyCapsule_New((void *) self->object.this$, "jobject", NULL); } #endif /* PYTHON */ Modified: lucene/pylucene/trunk/jcc/jcc3/sources/functions.cpp URL: http://svn.apache.org/viewvc/lucene/pylucene/trunk/jcc/jcc3/sources/functions.cpp?rev=1787656&r1=1759171&r2=1787656&view=diff ============================================================================== --- lucene/pylucene/trunk/jcc/jcc3/sources/functions.cpp (original) +++ lucene/pylucene/trunk/jcc/jcc3/sources/functions.cpp Sun Mar 19 20:26:48 2017 @@ -131,7 +131,7 @@ PyObject *makeInterface(PyObject *self, if (!PyArg_ParseTuple(args, "s#s#", &name, &name_len, &extName, &extName_len)) return NULL; - + JNIEnv *vm_env = env->get_vm_env(); jclass _ucl = (jclass) vm_env->FindClass("java/net/URLClassLoader"); jmethodID mid = vm_env->GetStaticMethodID(_ucl, "getSystemClassLoader", @@ -217,7 +217,7 @@ PyObject *makeClass(PyObject *self, PyOb &name, &name_len, &extName, &extName_len, &implName, &implName_len)) return NULL; - + JNIEnv *vm_env = env->get_vm_env(); jclass _ucl = (jclass) vm_env->FindClass("java/net/URLClassLoader"); jmethodID mid = vm_env->GetStaticMethodID(_ucl, "getSystemClassLoader", @@ -266,14 +266,14 @@ PyObject *makeClass(PyObject *self, PyOb static boxfn get_boxfn(PyTypeObject *type) { - static PyObject *boxfn_ = PyString_FromString("boxfn_"); + static PyObject *boxfn_ = PyUnicode_FromString("boxfn_"); PyObject *cobj = PyObject_GetAttr((PyObject *) type, boxfn_); boxfn fn; - + if (cobj == NULL) return NULL; - fn = (boxfn) PyCObject_AsVoidPtr(cobj); + fn = (boxfn) PyCapsule_GetPointer(cobj, "boxfn"); Py_DECREF(cobj); return fn; @@ -281,7 +281,7 @@ static boxfn get_boxfn(PyTypeObject *typ static int is_instance_of(PyObject *arg, PyTypeObject *type) { - static PyObject *class_ = PyString_FromString("class_"); + static PyObject *class_ = PyUnicode_FromString("class_"); PyObject *clsObj = PyObject_GetAttr((PyObject *) type, class_); int result; @@ -300,13 +300,13 @@ static int is_instance_of(PyObject *arg, #if defined(_MSC_VER) || defined(__SUNPRO_CC) int __parseArgs(PyObject *args, char *types, ...) { - int count = ((PyTupleObject *)(args))->ob_size; + int count = PY_SIZE((PyTupleObject *) args); va_list list, check; va_start(list, types); va_start(check, types); - return _parseArgs(((PyTupleObject *)(args))->ob_item, count, types, + return _parseArgs(((PyTupleObject *) args)->ob_item, count, types, list, check); } @@ -422,7 +422,7 @@ int _parseArgs(PyObject **args, unsigned break; if (PySequence_Check(arg) && - !PyString_Check(arg) && !PyUnicode_Check(arg)) + !PyBytes_Check(arg) && !PyUnicode_Check(arg)) { if (PySequence_Length(arg) > 0) { @@ -537,17 +537,20 @@ int _parseArgs(PyObject **args, unsigned if (last) { - if ((PyString_Check(arg) && (PyString_Size(arg) == 1)) || - PyInt_CheckExact(arg)) + if ((PyBytes_Check(arg) && (PyBytes_Size(arg) == 1)) || + (PyUnicode_Check(arg) && (PyUnicode_GetLength(arg) == 1)) || + PyLong_CheckExact(arg)) { varargs = true; break; } } } - else if (PyString_Check(arg) && (PyString_Size(arg) == 1)) + else if (PyBytes_Check(arg) && (PyBytes_Size(arg) == 1)) break; - else if (PyInt_CheckExact(arg)) + else if (PyUnicode_Check(arg) && (PyUnicode_GetLength(arg) == 1)) + break; + else if (PyLong_CheckExact(arg)) break; return -1; @@ -564,14 +567,17 @@ int _parseArgs(PyObject **args, unsigned if (last) { - if (PyUnicode_Check(arg) && (PyUnicode_GET_SIZE(arg) == 1)) + if ((PyBytes_Check(arg) && (PyBytes_Size(arg) == 1)) || + (PyUnicode_Check(arg) && (PyUnicode_GetLength(arg) == 1))) { varargs = true; break; } } } - else if (PyUnicode_Check(arg) && PyUnicode_GET_SIZE(arg) == 1) + else if (PyBytes_Check(arg) && PyBytes_Size(arg) == 1) + break; + else if (PyUnicode_Check(arg) && PyUnicode_GetLength(arg) == 1) break; return -1; } @@ -591,7 +597,7 @@ int _parseArgs(PyObject **args, unsigned if (PySequence_Length(arg) > 0) { PyObject *obj = PySequence_GetItem(arg, 0); - int ok = PyInt_CheckExact(obj); + int ok = PyLong_CheckExact(obj); Py_DECREF(obj); if (ok) @@ -601,13 +607,13 @@ int _parseArgs(PyObject **args, unsigned break; } - if (last && PyInt_CheckExact(arg)) + if (last && PyLong_CheckExact(arg)) { varargs = true; break; } } - else if (PyInt_CheckExact(arg)) + else if (PyLong_CheckExact(arg)) break; return -1; @@ -628,7 +634,7 @@ int _parseArgs(PyObject **args, unsigned if (PySequence_Length(arg) > 0) { PyObject *obj = PySequence_GetItem(arg, 0); - int ok = PyInt_CheckExact(obj); + int ok = PyLong_CheckExact(obj); Py_DECREF(obj); if (ok) @@ -638,13 +644,13 @@ int _parseArgs(PyObject **args, unsigned break; } - if (last && PyInt_CheckExact(arg)) + if (last && PyLong_CheckExact(arg)) { varargs = true; break; } } - else if (PyInt_CheckExact(arg)) + else if (PyLong_CheckExact(arg)) break; return -1; @@ -771,15 +777,15 @@ int _parseArgs(PyObject **args, unsigned if (PyObject_TypeCheck(arg, PY_TYPE(JArrayString))) break; - if (PySequence_Check(arg) && - !PyString_Check(arg) && !PyUnicode_Check(arg)) + if (PySequence_Check(arg) && + !PyBytes_Check(arg) && !PyUnicode_Check(arg)) { if (PySequence_Length(arg) > 0) { PyObject *obj = PySequence_GetItem(arg, 0); int ok = (obj == Py_None || - PyString_Check(obj) || PyUnicode_Check(obj)); + PyBytes_Check(obj) || PyUnicode_Check(obj)); Py_DECREF(obj); if (ok) @@ -787,17 +793,17 @@ int _parseArgs(PyObject **args, unsigned } else break; - } + } if (last && (arg == Py_None || - PyString_Check(arg) || PyUnicode_Check(arg))) + PyBytes_Check(arg) || PyUnicode_Check(arg))) { varargs = true; break; } } else if (arg == Py_None || - PyString_Check(arg) || PyUnicode_Check(arg)) + PyBytes_Check(arg) || PyUnicode_Check(arg)) break; return -1; @@ -813,7 +819,7 @@ int _parseArgs(PyObject **args, unsigned if (type != NULL) { boxfn fn = get_boxfn(type); - + if (fn == NULL || fn(type, arg, NULL) < 0) return -1; } @@ -822,7 +828,7 @@ int _parseArgs(PyObject **args, unsigned case 'T': /* tuple of python types with wrapfn_ */ { - static PyObject *wrapfn_ = PyString_FromString("wrapfn_"); + static PyObject *wrapfn_ = PyUnicode_FromString("wrapfn_"); int len = va_arg(list, int); if (PyTuple_Check(arg)) @@ -937,7 +943,7 @@ int _parseArgs(PyObject **args, unsigned *array = fromPySequence(cls, args + a, count - a); else if (PyObject_TypeCheck(arg, PY_TYPE(JArrayObject))) *array = ((t_JArray *) arg)->array; - else + else *array = JArray(cls, arg); if (PyErr_Occurred()) @@ -954,7 +960,7 @@ int _parseArgs(PyObject **args, unsigned if (tc == 'K') { PyTypeObject ***tp = va_arg(list, PyTypeObject ***); - PyTypeObject **(*parameters_)(void *) = + PyTypeObject **(*parameters_)(void *) = va_arg(list, getparametersfn); if (arg == Py_None) @@ -1009,21 +1015,26 @@ int _parseArgs(PyObject **args, unsigned *array = JArray(args + a, count - a); else if (PyObject_TypeCheck(arg, PY_TYPE(JArrayByte))) *array = ((t_JArray *) arg)->array; - else + else *array = JArray(arg); if (PyErr_Occurred()) return -1; } - else if (PyString_Check(arg)) + else if (PyBytes_Check(arg)) + { + jbyte *a = va_arg(list, jbyte *); + *a = (jbyte) PyBytes_AS_STRING(arg)[0]; + } + else if (PyUnicode_Check(arg)) { jbyte *a = va_arg(list, jbyte *); - *a = (jbyte) PyString_AS_STRING(arg)[0]; + *a = (jbyte) PyUnicode_AsUTF8(arg)[0]; } else { jbyte *a = va_arg(list, jbyte *); - *a = (jbyte) PyInt_AsLong(arg); + *a = (jbyte) PyLong_AsLong(arg); } break; } @@ -1040,7 +1051,7 @@ int _parseArgs(PyObject **args, unsigned *array = JArray(args + a, count - a); else if (PyObject_TypeCheck(arg, PY_TYPE(JArrayChar))) *array = ((t_JArray *) arg)->array; - else + else *array = JArray(arg); if (PyErr_Occurred()) @@ -1049,7 +1060,7 @@ int _parseArgs(PyObject **args, unsigned else { jchar *c = va_arg(list, jchar *); - *c = (jchar) PyUnicode_AS_UNICODE(arg)[0]; + *c = (jchar) PyUnicode_READ_CHAR(arg, 0); } break; } @@ -1066,7 +1077,7 @@ int _parseArgs(PyObject **args, unsigned *array = JArray(args + a, count - a); else if (PyObject_TypeCheck(arg, PY_TYPE(JArrayInt))) *array = ((t_JArray *) arg)->array; - else + else *array = JArray(arg); if (PyErr_Occurred()) @@ -1075,7 +1086,7 @@ int _parseArgs(PyObject **args, unsigned else { jint *n = va_arg(list, jint *); - *n = (jint) PyInt_AsLong(arg); + *n = (jint) PyLong_AsLong(arg); } break; } @@ -1092,7 +1103,7 @@ int _parseArgs(PyObject **args, unsigned *array = JArray(args + a, count - a); else if (PyObject_TypeCheck(arg, PY_TYPE(JArrayShort))) *array = ((t_JArray *) arg)->array; - else + else *array = JArray(arg); if (PyErr_Occurred()) @@ -1101,7 +1112,7 @@ int _parseArgs(PyObject **args, unsigned else { jshort *n = va_arg(list, jshort *); - *n = (jshort) PyInt_AsLong(arg); + *n = (jshort) PyLong_AsLong(arg); } break; } @@ -1118,7 +1129,7 @@ int _parseArgs(PyObject **args, unsigned *array = JArray(args + a, count - a); else if (PyObject_TypeCheck(arg, PY_TYPE(JArrayDouble))) *array = ((t_JArray *) arg)->array; - else + else *array = JArray(arg); if (PyErr_Occurred()) @@ -1144,7 +1155,7 @@ int _parseArgs(PyObject **args, unsigned *array = JArray(args + a, count - a); else if (PyObject_TypeCheck(arg, PY_TYPE(JArrayFloat))) *array = ((t_JArray *) arg)->array; - else + else *array = JArray(arg); if (PyErr_Occurred()) @@ -1170,7 +1181,7 @@ int _parseArgs(PyObject **args, unsigned *array = JArray(args + a, count - a); else if (PyObject_TypeCheck(arg, PY_TYPE(JArrayLong))) *array = ((t_JArray *) arg)->array; - else + else *array = JArray(arg); if (PyErr_Occurred()) @@ -1233,7 +1244,7 @@ int _parseArgs(PyObject **args, unsigned *array = JArray