Commit ce860949 authored by Vinzenz Feenstra's avatar Vinzenz Feenstra

Allow string + bytearray => bytearray. Fixes #780

parent 8e45b42d
...@@ -342,10 +342,16 @@ extern "C" Box* strAdd(BoxedString* lhs, Box* _rhs) { ...@@ -342,10 +342,16 @@ extern "C" Box* strAdd(BoxedString* lhs, Box* _rhs) {
} }
if (!PyString_Check(_rhs)) { if (!PyString_Check(_rhs)) {
// Note: this is deliberately not returning NotImplemented, even though if (PyByteArray_Check(_rhs)) {
// that would be more usual. I assume this behavior of CPython's is Box* rtn = PyByteArray_Concat(lhs, _rhs);
// for backwards compatibility. checkAndThrowCAPIException();
raiseExcHelper(TypeError, "cannot concatenate 'str' and '%s' objects", getTypeName(_rhs)); return rtn;
} else {
// Note: this is deliberately not returning NotImplemented, even though
// that would be more usual. I assume this behavior of CPython's is
// for backwards compatibility.
raiseExcHelper(TypeError, "cannot concatenate 'str' and '%s' objects", getTypeName(_rhs));
}
} }
BoxedString* rhs = static_cast<BoxedString*>(_rhs); BoxedString* rhs = static_cast<BoxedString*>(_rhs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment