Handle TypeError fixes backported to Python 3.5.4

See beeware#595 for the original problem. As the fix done in Python 3.6.2 was also backported to 3.5.4, extend the version checks made in beeware#607. See also python/cpython#724.
whydoubt · Nov 4, 2017 · 1f4f2be · 1f4f2be
1 parent 6acc30b
commit 1f4f2be
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/python/common/org/python/types/ByteArray.java b/python/common/org/python/types/ByteArray.java
@@ -244,7 +244,7 @@ public org.python.Object __add__(org.python.Object other) {
             System.arraycopy(other_bytes, 0, new_bytes, this.value.length, other_bytes.length);
             return new ByteArray(new_bytes);
         }
-        if (org.Python.VERSION < 0x03060200) {
+        if (org.Python.VERSION < 0x03050400 || (org.Python.VERSION >= 0x03060000 && org.Python.VERSION < 0x03060200)) {
             throw new org.python.exceptions.TypeError("can't concat " + this.typeName() + " to " + other.typeName());
         } else {
             throw new org.python.exceptions.TypeError("can't concat " + other.typeName() + " to " + this.typeName());
@@ -259,7 +259,7 @@ public org.python.Object __iadd__(org.python.Object other) {
         try {
             return super.__iadd__(other);
         } catch (org.python.exceptions.TypeError ae) {
-            if (org.Python.VERSION < 0x03060200) {
+            if (org.Python.VERSION < 0x03050400 || (org.Python.VERSION >= 0x03060000 && org.Python.VERSION < 0x03060200)) {
                 throw new org.python.exceptions.TypeError("can't concat " + other.typeName() + " to " + this.typeName());
             } else {
                 throw ae;

diff --git a/python/common/org/python/types/Bytes.java b/python/common/org/python/types/Bytes.java
@@ -128,7 +128,7 @@ public org.python.Object __add__(org.python.Object other) {
             System.arraycopy(other_bytes, 0, new_bytes, this.value.length, other_bytes.length);
             return new Bytes(new_bytes);
         }
-        if (org.Python.VERSION < 0x03060200) {
+        if (org.Python.VERSION < 0x03050400 || (org.Python.VERSION >= 0x03060000 && org.Python.VERSION < 0x03060200)) {
             throw new org.python.exceptions.TypeError("can't concat bytes to " + other.typeName());
         } else {
             throw new org.python.exceptions.TypeError("can't concat " + other.typeName() + " to bytes");