[patch] PyQt5-5.13.0-python2_fix.patch

PyQt5-5.13.0-python2_fix.patch (text/plain), 880 bytes, created by Lars Wendler (Polynomial-C) (RETIRED) on 2019-07-29 11:01:54 UTC

http://python.6.x6.nabble.com/bug-QFontMetrics-Regression-in-5-13-on-Python2-td5256561.html

--- PyQt5_gpl-5.13.0/qpy/QtCore/qpycore_qstring.cpp
+++ PyQt5_gpl-5.13.1.dev1907281803/qpy/QtCore/qpycore_qstring.cpp
@@ -161,14 +161,19 @@
 // Convert a Python string object to a QString.
 QString qpycore_PyObject_AsQString(PyObject *obj)
 {
-#if PY_MAJOR_VERSION <= 2
-    const char *obj_s = PyString_AsString(obj);
+#if PY_MAJOR_VERSION < 3
+    if (PyString_Check(obj))
+    {
+        const char *obj_s = PyString_AsString(obj);
 
-    if (!obj_s)
-        return QString();
+        if (!obj_s)
+            return QString();
 
-    return QString::fromUtf8(obj_s);
-#elif defined(PYQT_PEP_393)
+        return QString::fromUtf8(obj_s);
+    }
+#endif
+
+#if defined(PYQT_PEP_393)
     int char_size;
     Py_ssize_t len;
     void *data = sipUnicodeData(obj, &char_size, &len);