changed to only map unicode to QByteArray in non-strict mode

florianlink · florianlink · commit 6986dba36d20 · 2014-09-22T07:09:16.000Z
diff --git a/src/PythonQtConversion.cpp b/src/PythonQtConversion.cpp
@@ -565,7 +565,7 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i
        {
          QByteArray bytes = PyObjGetBytes(obj, strict, ok);
 #ifdef PY3K
-         if (!ok) {
+         if (!ok && !strict) {
            // since Qt uses QByteArray in many places for identifier strings,
            // we need to allow implicit conversion from unicode as well:
            bytes = PyObjGetString(obj, strict, ok).toUtf8();

Original file line number	Diff line number	Diff line change
`@@ -565,7 +565,7 @@ void* PythonQtConv::ConvertPythonToQt(const PythonQtMethodInfo::ParameterInfo& i`
`565`	`565`	`{`
`566`	`566`	`QByteArray bytes = PyObjGetBytes(obj, strict, ok);`
`567`	`567`	`#ifdef PY3K`
`568`		`- if (!ok) {`
	`568`	`+ if (!ok && !strict) {`
`569`	`569`	`// since Qt uses QByteArray in many places for identifier strings,`
`570`	`570`	`// we need to allow implicit conversion from unicode as well:`
`571`	`571`	`bytes = PyObjGetString(obj, strict, ok).toUtf8();`