fixes bytearray tests again (python3)

gbm001 · Dec 10, 2015 · ac2324d · ac2324d
1 parent c8ede02
commit ac2324d
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/jnius/jnius_conversion.pxi b/jnius/jnius_conversion.pxi
@@ -60,7 +60,7 @@ cdef void populate_args(JNIEnv *j_env, tuple definition_args, jvalue *j_args, ar
  try:
  py_str = <bytes>py_arg
  j_args[index].l = j_env[0].NewStringUTF(j_env, <char *>py_str)
- except UnicodeEncodeError:
+ except (UnicodeEncodeError, TypeError):
  py_str = <bytes>py_arg.encode('utf-8')
  j_args[index].l = j_env[0].NewStringUTF(j_env, <char *>py_str)
  elif isinstance(py_arg, JavaClass):

diff --git a/tests/test_bytearray.py b/tests/test_bytearray.py
@@ -29,13 +29,13 @@ def test_create_bytearray(self):
  nis = StringBufferInputStream("Hello world")
  barr = bytearray("\x00" * 5, encoding="utf8")
  self.assertEquals(nis.read(barr, 0, 5), 5)
- self.assertEquals(barr, "Hello")
+ self.assertEquals(barr, b"Hello")
 
  def test_bytearray_ascii(self):
  ByteArrayInputStream = autoclass('java.io.ByteArrayInputStream')
- s = "".join(chr(x) for x in range(256))
+ s = b"".join(bytes(x) for x in range(256))
  nis = ByteArrayInputStream(s)
  barr = bytearray("\x00" * 256, encoding="ascii")
  self.assertEquals(nis.read(barr, 0, 256), 256)
- self.assertEquals(barr, s)
+ self.assertEquals(barr[:256], s[:256])