charSequence: remove repeated code.

gbm001 · Mar 16, 2016 · 9565b7d · 9565b7d
1 parent 6fc9107
commit 9565b7d
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/jnius/jnius_conversion.pxi b/jnius/jnius_conversion.pxi
@@ -138,16 +138,16 @@ cdef convert_jobject_to_python(JNIEnv *j_env, definition, jobject j_object):
  # if we got a string, just convert back to Python str.
  if r in ('java/lang/String', 'java/lang/CharSequence'):
  if r == 'java/lang/CharSequence':
+ # call toString()
  retclass = j_env[0].GetObjectClass(j_env, j_object)
  retmeth = j_env[0].GetMethodID(j_env, retclass, "toString", "()Ljava/lang/String;")
  string = <jstring> (j_env[0].CallObjectMethod(j_env, j_object, retmeth))
- c_str = <char *>j_env[0].GetStringUTFChars(j_env, string, NULL)
- py_str = <bytes>c_str
- j_env[0].ReleaseStringUTFChars(j_env, string, c_str)
  else:
- c_str = <char *>j_env[0].GetStringUTFChars(j_env, j_object, NULL)
- py_str = <bytes>c_str
- j_env[0].ReleaseStringUTFChars(j_env, j_object, c_str)
+ string = <jstring>j_object
+ c_str = <char *>j_env[0].GetStringUTFChars(j_env, string, NULL)
+ py_str = <bytes>c_str
+ j_env[0].ReleaseStringUTFChars(j_env, string, c_str)
+
 
  if PY_MAJOR_VERSION < 3:
  return py_str