Skip to content

Commit bbdd2a3

Browse files
committed
Remove old fallback code for PyQt4
1 parent 5387329 commit bbdd2a3

File tree

1 file changed

+3
-15
lines changed

1 file changed

+3
-15
lines changed

qwt/null_paintdevice.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,7 @@ def drawRects(self, rects, rectCount=None):
4848
if device is None:
4949
return
5050
if device.mode() != QwtNullPaintDevice.NormalMode:
51-
try:
52-
QPaintEngine.drawRects(self, rects, rectCount)
53-
except TypeError:
54-
# PyQt <=4.9
55-
QPaintEngine.drawRects(self, rects)
51+
QPaintEngine.drawRects(self, rects, rectCount)
5652
return
5753
device.drawRects(rects, rectCount)
5854

@@ -63,11 +59,7 @@ def drawLines(self, lines, lineCount=None):
6359
if device is None:
6460
return
6561
if device.mode() != QwtNullPaintDevice.NormalMode and QT_API.startswith("pyqt"):
66-
try:
67-
QPaintEngine.drawLines(lines, lineCount)
68-
except TypeError:
69-
# PyQt <=4.9
70-
QPaintEngine.drawLines(self, lines)
62+
QPaintEngine.drawLines(lines, lineCount)
7163
return
7264
device.drawLines(lines, lineCount)
7365

@@ -93,11 +85,7 @@ def drawPoints(self, points, pointCount=None):
9385
if device is None:
9486
return
9587
if device.mode() != QwtNullPaintDevice.NormalMode:
96-
try:
97-
QPaintEngine.drawPoints(points, pointCount)
98-
except TypeError:
99-
# PyQt <=4.9
100-
QPaintEngine.drawPoints(self, points)
88+
QPaintEngine.drawPoints(points, pointCount)
10189
return
10290
device.drawPoints(points, pointCount)
10391

0 commit comments

Comments
 (0)