Improved Qt universal support (PyQt5, PySide2, ...)

Author: PierreRaybaut

qwt/legend.py

@@ -639,8 +639,8 @@ class QwtLegend(QwtAbstractLegend):
             Clicks are disabled as default
     """
 
-    clicked = Signal("PyQt_PyObject", int)
-    checked = Signal("PyQt_PyObject", bool, int)
+    clicked = Signal(object, int)
+    checked = Signal(object, bool, int)
 
     def __init__(self, parent=None):
         QwtAbstractLegend.__init__(self, parent)

qwt/plot.py

@@ -25,7 +25,7 @@
     QFrame,
     QApplication,
 )
-from qtpy.QtGui import QFont, QPainter, QPalette, QColor
+from qtpy.QtGui import QFont, QPainter, QPalette, QColor, QBrush
 from qtpy.QtCore import Qt, Signal, QEvent, QSize, QRectF
 
 from qwt.text import QwtText, QwtTextLabel
@@ -272,8 +272,8 @@ class QwtPlot(QFrame, QwtPlotDict):
 
     """
 
-    itemAttached = Signal("PyQt_PyObject", bool)
-    legendDataChanged = Signal("PyQt_PyObject", "PyQt_PyObject")
+    itemAttached = Signal(object, bool)
+    legendDataChanged = Signal(object, object)
 
     # enum Axis
     AXES = yLeft, yRight, xBottom, xTop = list(range(4))
@@ -1513,7 +1513,7 @@ def setCanvasBackground(self, brush):
             :py:meth:`canvasBackground()`
         """
         pal = self.__data.canvas.palette()
-        pal.setBrush(QPalette.Window, brush)
+        pal.setBrush(QPalette.Window, QBrush(brush))
         self.canvas().setPalette(pal)
 
     def canvasBackground(self):

qwt/plot_grid.py

@@ -100,7 +100,7 @@ def make(
         if z is not None:
             item.setZ(z)
         color = qcolor_from_str(color, Qt.gray)
-        width = 1.0 if width is None else width
+        width = 1.0 if width is None else float(width)
         style = Qt.DotLine if style is None else style
         item.setPen(QPen(color, width, style))
         if mincolor is not None or minwidth is not None or minstyle is not None:

qwt/tests/__init__.py

@@ -149,7 +149,7 @@ def add_test(self, fname):
         button.setText(bname)
         button.setToolTip(fname)
         button.setIconSize(QSize(130, 80))
-        button.clicked.connect(lambda checked, fname=fname: run_test(fname))
+        button.clicked.connect(lambda checked=None, fname=fname: run_test(fname))
         self.grid_layout.addWidget(button, row, column)
 
     def about(self):