Skip to content

Commit 37e972f

Browse files
stlehmannstlehmann
committed
Fix issues to make mypy succeed
1 parent c005219 commit 37e972f

File tree

4 files changed

+50
-50
lines changed

4 files changed

+50
-50
lines changed

‎PyQt5-stubs/QtGui.pyi

+33-33
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ class QPixmap(QPaintDevice):
176176
@typing.overload
177177
def __init__(self, xpm: typing.List[str]) -> None: ...
178178
@typing.overload
179-
def __init__(self, a0: 'QPixmap') -> None: ...
179+
def __init__(self, a0: 'QPixmap') -> None: ... # type: ignore
180180
@typing.overload
181181
def __init__(self, variant: typing.Any) -> None: ...
182182

@@ -938,26 +938,26 @@ class QClipboard(QtCore.QObject):
938938

939939
class QColorSpace(sip.simplewrapper):
940940

941-
class TransferFunction(int): ...
942-
Custom = ... # type: 'QColorSpace.TransferFunction'
943-
Linear = ... # type: 'QColorSpace.TransferFunction'
944-
Gamma = ... # type: 'QColorSpace.TransferFunction'
945-
SRgb = ... # type: 'QColorSpace.TransferFunction'
946-
ProPhotoRgb = ... # type: 'QColorSpace.TransferFunction'
941+
class TransferFunction(int):
942+
Custom = ... # type: 'QColorSpace.TransferFunction'
943+
Linear = ... # type: 'QColorSpace.TransferFunction'
944+
Gamma = ... # type: 'QColorSpace.TransferFunction'
945+
SRgb = ... # type: 'QColorSpace.TransferFunction'
946+
ProPhotoRgb = ... # type: 'QColorSpace.TransferFunction'
947947

948-
class Primaries(int): ...
949-
Custom = ... # type: 'QColorSpace.Primaries'
950-
SRgb = ... # type: 'QColorSpace.Primaries'
951-
AdobeRgb = ... # type: 'QColorSpace.Primaries'
952-
DciP3D65 = ... # type: 'QColorSpace.Primaries'
953-
ProPhotoRgb = ... # type: 'QColorSpace.Primaries'
948+
class Primaries(int):
949+
Custom = ... # type: 'QColorSpace.Primaries'
950+
SRgb = ... # type: 'QColorSpace.Primaries'
951+
AdobeRgb = ... # type: 'QColorSpace.Primaries'
952+
DciP3D65 = ... # type: 'QColorSpace.Primaries'
953+
ProPhotoRgb = ... # type: 'QColorSpace.Primaries'
954954

955-
class NamedColorSpace(int): ...
956-
SRgb = ... # type: 'QColorSpace.NamedColorSpace'
957-
SRgbLinear = ... # type: 'QColorSpace.NamedColorSpace'
958-
AdobeRgb = ... # type: 'QColorSpace.NamedColorSpace'
959-
DisplayP3 = ... # type: 'QColorSpace.NamedColorSpace'
960-
ProPhotoRgb = ... # type: 'QColorSpace.NamedColorSpace'
955+
class NamedColorSpace(int):
956+
SRgb = ... # type: 'QColorSpace.NamedColorSpace'
957+
SRgbLinear = ... # type: 'QColorSpace.NamedColorSpace'
958+
AdobeRgb = ... # type: 'QColorSpace.NamedColorSpace'
959+
DisplayP3 = ... # type: 'QColorSpace.NamedColorSpace'
960+
ProPhotoRgb = ... # type: 'QColorSpace.NamedColorSpace'
961961

962962
@typing.overload
963963
def __init__(self) -> None: ...
@@ -2667,7 +2667,7 @@ class QImage(QPaintDevice):
26672667
@typing.overload
26682668
def fill(self, color: QtCore.Qt.GlobalColor) -> None: ...
26692669
@typing.overload
2670-
def fill(self, color: typing.Union[QColor, QtCore.Qt.GlobalColor, QGradient]) -> None: ...
2670+
def fill(self, color: typing.Union[QColor, QtCore.Qt.GlobalColor, QGradient]) -> None: ... # type: ignore
26712671
@typing.overload
26722672
def fill(self, pixel: int) -> None: ...
26732673
def setColorTable(self, colors: typing.Iterable[int]) -> None: ...
@@ -3090,11 +3090,11 @@ class QMatrix4x4(sip.simplewrapper):
30903090
@typing.overload
30913091
def map(self, point: QtCore.QPoint) -> QtCore.QPoint: ...
30923092
@typing.overload
3093-
def map(self, point: QtCore.QPointF) -> QtCore.QPointF: ...
3093+
def map(self, point: QtCore.QPointF) -> QtCore.QPointF: ... # type: ignore
30943094
@typing.overload
3095-
def map(self, point: 'QVector3D') -> 'QVector3D': ...
3095+
def map(self, point: 'QVector3D') -> 'QVector3D': ... # type: ignore
30963096
@typing.overload
3097-
def map(self, point: 'QVector4D') -> 'QVector4D': ...
3097+
def map(self, point: 'QVector4D') -> 'QVector4D': ... # type: ignore
30983098
def fill(self, value: float) -> None: ...
30993099
def setToIdentity(self) -> None: ...
31003100
def isIdentity(self) -> bool: ...
@@ -3109,7 +3109,7 @@ class QMatrix4x4(sip.simplewrapper):
31093109
@typing.overload
31103110
def mapRect(self, rect: QtCore.QRect) -> QtCore.QRect: ...
31113111
@typing.overload
3112-
def mapRect(self, rect: QtCore.QRectF) -> QtCore.QRectF: ...
3112+
def mapRect(self, rect: QtCore.QRectF) -> QtCore.QRectF: ... # type: ignore
31133113
@typing.overload
31143114
def toTransform(self) -> 'QTransform': ...
31153115
@typing.overload
@@ -3121,7 +3121,7 @@ class QMatrix4x4(sip.simplewrapper):
31213121
@typing.overload
31223122
def ortho(self, rect: QtCore.QRect) -> None: ...
31233123
@typing.overload
3124-
def ortho(self, rect: QtCore.QRectF) -> None: ...
3124+
def ortho(self, rect: QtCore.QRectF) -> None: ... # type: ignore
31253125
@typing.overload
31263126
def ortho(self, left: float, right: float, bottom: float, top: float, nearPlane: float, farPlane: float) -> None: ...
31273127
@typing.overload
@@ -3758,11 +3758,11 @@ class QOpenGLShaderProgram(QtCore.QObject):
37583758
@typing.overload
37593759
def setUniformValue(self, location: int, point: QtCore.QPoint) -> None: ...
37603760
@typing.overload
3761-
def setUniformValue(self, location: int, point: typing.Union[QtCore.QPointF, QtCore.QPoint]) -> None: ...
3761+
def setUniformValue(self, location: int, point: typing.Union[QtCore.QPointF, QtCore.QPoint]) -> None: ... # type: ignore
37623762
@typing.overload
37633763
def setUniformValue(self, location: int, size: QtCore.QSize) -> None: ...
37643764
@typing.overload
3765-
def setUniformValue(self, location: int, size: QtCore.QSizeF) -> None: ...
3765+
def setUniformValue(self, location: int, size: QtCore.QSizeF) -> None: ... # type: ignore
37663766
@typing.overload
37673767
def setUniformValue(self, location: int, value: QMatrix2x2) -> None: ...
37683768
@typing.overload
@@ -3804,11 +3804,11 @@ class QOpenGLShaderProgram(QtCore.QObject):
38043804
@typing.overload
38053805
def setUniformValue(self, name: str, point: QtCore.QPoint) -> None: ...
38063806
@typing.overload
3807-
def setUniformValue(self, name: str, point: typing.Union[QtCore.QPointF, QtCore.QPoint]) -> None: ...
3807+
def setUniformValue(self, name: str, point: typing.Union[QtCore.QPointF, QtCore.QPoint]) -> None: ... # type: ignore
38083808
@typing.overload
38093809
def setUniformValue(self, name: str, size: QtCore.QSize) -> None: ...
38103810
@typing.overload
3811-
def setUniformValue(self, name: str, size: QtCore.QSizeF) -> None: ...
3811+
def setUniformValue(self, name: str, size: QtCore.QSizeF) -> None: ... # type: ignore
38123812
@typing.overload
38133813
def setUniformValue(self, name: str, value: QMatrix2x2) -> None: ...
38143814
@typing.overload
@@ -5214,7 +5214,7 @@ class QPainter(sip.simplewrapper):
52145214
@typing.overload
52155215
def drawRoundedRect(self, x: int, y: int, w: int, h: int, xRadius: float, yRadius: float, mode: QtCore.Qt.SizeMode = ...) -> None: ...
52165216
@typing.overload
5217-
def drawRoundedRect(self, rect: QtCore.QRect, xRadius: float, yRadius: float, mode: QtCore.Qt.SizeMode = ...) -> None: ...
5217+
def drawRoundedRect(self, rect: QtCore.QRect, xRadius: float, yRadius: float, mode: QtCore.Qt.SizeMode = ...) -> None: ... # type: ignore
52185218
def testRenderHint(self, hint: 'QPainter.RenderHint') -> bool: ...
52195219
def combinedTransform(self) -> 'QTransform': ...
52205220
def worldTransform(self) -> 'QTransform': ...
@@ -5230,7 +5230,7 @@ class QPainter(sip.simplewrapper):
52305230
@typing.overload
52315231
def drawImage(self, r: QtCore.QRectF, image: QImage) -> None: ...
52325232
@typing.overload
5233-
def drawImage(self, r: QtCore.QRect, image: QImage) -> None: ...
5233+
def drawImage(self, r: QtCore.QRect, image: QImage) -> None: ... # type: ignore
52345234
@typing.overload
52355235
def drawImage(self, p: typing.Union[QtCore.QPointF, QtCore.QPoint], image: QImage) -> None: ...
52365236
# @typing.overload
@@ -5240,11 +5240,11 @@ class QPainter(sip.simplewrapper):
52405240
@typing.overload
52415241
def drawImage(self, targetRect: QtCore.QRectF, image: QImage, sourceRect: QtCore.QRectF, flags: typing.Union[QtCore.Qt.ImageConversionFlags, QtCore.Qt.ImageConversionFlag] = ...) -> None: ...
52425242
@typing.overload
5243-
def drawImage(self, targetRect: QtCore.QRect, image: QImage, sourceRect: QtCore.QRect, flags: typing.Union[QtCore.Qt.ImageConversionFlags, QtCore.Qt.ImageConversionFlag] = ...) -> None: ...
5243+
def drawImage(self, targetRect: QtCore.QRect, image: QImage, sourceRect: QtCore.QRect, flags: typing.Union[QtCore.Qt.ImageConversionFlags, QtCore.Qt.ImageConversionFlag] = ...) -> None: ... # type: ignore
52445244
@typing.overload
52455245
def drawImage(self, p: typing.Union[QtCore.QPointF, QtCore.QPoint], image: QImage, sr: QtCore.QRectF, flags: typing.Union[QtCore.Qt.ImageConversionFlags, QtCore.Qt.ImageConversionFlag] = ...) -> None: ...
52465246
@typing.overload
5247-
def drawImage(self, p: QtCore.QPoint, image: QImage, sr: QtCore.QRect, flags: typing.Union[QtCore.Qt.ImageConversionFlags, QtCore.Qt.ImageConversionFlag] = ...) -> None: ...
5247+
def drawImage(self, p: QtCore.QPoint, image: QImage, sr: QtCore.QRect, flags: typing.Union[QtCore.Qt.ImageConversionFlags, QtCore.Qt.ImageConversionFlag] = ...) -> None: ... # type: ignore
52485248
@typing.overload
52495249
def drawPoint(self, p: typing.Union[QtCore.QPointF, QtCore.QPoint]) -> None: ...
52505250
@typing.overload

‎PyQt5-stubs/QtNetwork.pyi

+3-3
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ PYQT_SLOT = typing.Union[typing.Callable[..., None], QtCore.pyqtBoundSignal]
3434

3535

3636
class QOcspRevocationReason(int): ...
37-
None = ... # type: QOcspRevocationReason
37+
# None = ... # type: QOcspRevocationReason
3838
Unspecified = ... # type: QOcspRevocationReason
3939
KeyCompromise = ... # type: QOcspRevocationReason
4040
CACompromise = ... # type: QOcspRevocationReason
@@ -771,13 +771,13 @@ class QNetworkAccessManager(QtCore.QObject):
771771
@typing.overload
772772
def put(self, request: 'QNetworkRequest', data: QtCore.QIODevice) -> 'QNetworkReply': ...
773773
@typing.overload
774-
def put(self, request: 'QNetworkRequest', data: typing.Union[QtCore.QByteArray, bytes, bytearray]) -> 'QNetworkReply': ...
774+
def put(self, request: 'QNetworkRequest', data: typing.Union[QtCore.QByteArray, bytes, bytearray]) -> 'QNetworkReply': ... # type: ignore
775775
@typing.overload
776776
def put(self, request: 'QNetworkRequest', multiPart: QHttpMultiPart) -> 'QNetworkReply': ...
777777
@typing.overload
778778
def post(self, request: 'QNetworkRequest', data: QtCore.QIODevice) -> 'QNetworkReply': ...
779779
@typing.overload
780-
def post(self, request: 'QNetworkRequest', data: typing.Union[QtCore.QByteArray, bytes, bytearray]) -> 'QNetworkReply': ...
780+
def post(self, request: 'QNetworkRequest', data: typing.Union[QtCore.QByteArray, bytes, bytearray]) -> 'QNetworkReply': ... # type: ignore
781781
@typing.overload
782782
def post(self, request: 'QNetworkRequest', multiPart: QHttpMultiPart) -> 'QNetworkReply': ...
783783
def get(self, request: 'QNetworkRequest') -> 'QNetworkReply': ...

‎PyQt5-stubs/QtTest.pyi

+6-6
Original file line numberDiff line numberDiff line change
@@ -140,19 +140,19 @@ class QTest(sip.simplewrapper):
140140
@typing.overload
141141
def keyRelease(self, widget: QtWidgets.QWidget, key: QtCore.Qt.Key, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
142142
@typing.overload
143-
def keyRelease(self, widget: QtWidgets.QWidget, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
143+
def keyRelease(self, widget: QtWidgets.QWidget, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ... # type: ignore
144144
@typing.overload
145145
def keyRelease(self, window: QtGui.QWindow, key: QtCore.Qt.Key, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
146146
@typing.overload
147-
def keyRelease(self, window: QtGui.QWindow, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
147+
def keyRelease(self, window: QtGui.QWindow, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ... # type: ignore
148148
@typing.overload
149149
def keyPress(self, widget: QtWidgets.QWidget, key: QtCore.Qt.Key, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
150150
@typing.overload
151-
def keyPress(self, widget: QtWidgets.QWidget, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
151+
def keyPress(self, widget: QtWidgets.QWidget, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ... # type: ignore
152152
@typing.overload
153153
def keyPress(self, window: QtGui.QWindow, key: QtCore.Qt.Key, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
154154
@typing.overload
155-
def keyPress(self, window: QtGui.QWindow, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
155+
def keyPress(self, window: QtGui.QWindow, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ... # type: ignore
156156
@typing.overload
157157
def keyEvent(self, action: 'QTest.KeyAction', widget: QtWidgets.QWidget, key: QtCore.Qt.Key, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
158158
@typing.overload
@@ -165,9 +165,9 @@ class QTest(sip.simplewrapper):
165165
@typing.overload
166166
def keyClick(self, widget: QtWidgets.QWidget, key: QtCore.Qt.Key, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
167167
@typing.overload
168-
def keyClick(self, widget: QtWidgets.QWidget, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
168+
def keyClick(self, widget: QtWidgets.QWidget, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ... # type: ignore
169169
@typing.overload
170170
def keyClick(self, window: QtGui.QWindow, key: QtCore.Qt.Key, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
171171
@typing.overload
172-
def keyClick(self, window: QtGui.QWindow, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ...
172+
def keyClick(self, window: QtGui.QWindow, key: str, modifier: typing.Union[QtCore.Qt.KeyboardModifiers, QtCore.Qt.KeyboardModifier] = ..., delay: int = ...) -> None: ... # type: ignore
173173
def qSleep(self, ms: int) -> None: ...

‎PyQt5-stubs/QtWidgets.pyi

+8-8
Original file line numberDiff line numberDiff line change
@@ -259,13 +259,13 @@ class QWidget(QtCore.QObject, QtGui.QPaintDevice):
259259
@typing.overload
260260
def repaint(self, a0: QtCore.QRect) -> None: ...
261261
@typing.overload
262-
def repaint(self, a0: QtGui.QRegion) -> None: ...
262+
def repaint(self, a0: QtGui.QRegion) -> None: ... # type: ignore
263263
@typing.overload
264264
def update(self) -> None: ...
265265
@typing.overload
266266
def update(self, a0: QtCore.QRect) -> None: ...
267267
@typing.overload
268-
def update(self, a0: QtGui.QRegion) -> None: ...
268+
def update(self, a0: QtGui.QRegion) -> None: ... # type: ignore
269269
@typing.overload
270270
def update(self, ax: int, ay: int, aw: int, ah: int) -> None: ...
271271
def setUpdatesEnabled(self, enable: bool) -> None: ...
@@ -330,7 +330,7 @@ class QWidget(QtCore.QObject, QtGui.QPaintDevice):
330330
@typing.overload
331331
def setMask(self, a0: QtGui.QBitmap) -> None: ...
332332
@typing.overload
333-
def setMask(self, a0: QtGui.QRegion) -> None: ...
333+
def setMask(self, a0: QtGui.QRegion) -> None: ... # type: ignore
334334
def unsetCursor(self) -> None: ...
335335
def setCursor(self, a0: typing.Union[QtGui.QCursor, QtCore.Qt.CursorShape]) -> None: ...
336336
def cursor(self) -> QtGui.QCursor: ...
@@ -1038,7 +1038,7 @@ class QAction(QtCore.QObject):
10381038
class QActionGroup(QtCore.QObject):
10391039

10401040
class ExclusionPolicy(int): ...
1041-
None = ... # type: 'QActionGroup.ExclusionPolicy'
1041+
# None = ... # type: 'QActionGroup.ExclusionPolicy'
10421042
Exclusive = ... # type: 'QActionGroup.ExclusionPolicy'
10431043
ExclusiveOptional = ... # type: 'QActionGroup.ExclusionPolicy'
10441044

@@ -1188,7 +1188,7 @@ class QApplication(QtGui.QGuiApplication):
11881188
def colorSpec() -> int: ...
11891189
@typing.overload
11901190
@staticmethod
1191-
def setStyle(a0: 'QStyle') -> None: ...
1191+
def setStyle(a0: 'QStyle') -> None: ... # type: ignore
11921192
@typing.overload
11931193
@staticmethod
11941194
def setStyle(a0: str) -> 'QStyle': ...
@@ -4995,7 +4995,7 @@ class QGraphicsRotation(QGraphicsTransform):
49954995
@typing.overload
49964996
def setAxis(self, axis: QtGui.QVector3D) -> None: ...
49974997
@typing.overload
4998-
def setAxis(self, axis: QtCore.Qt.Axis) -> None: ...
4998+
def setAxis(self, axis: QtCore.Qt.Axis) -> None: ... # type: ignore
49994999
def axis(self) -> QtGui.QVector3D: ...
50005000
def setAngle(self, a0: float) -> None: ...
50015001
def angle(self) -> float: ...
@@ -6760,7 +6760,7 @@ class QPlainTextEdit(QAbstractScrollArea):
67606760
@typing.overload
67616761
def find(self, exp: QtCore.QRegExp, options: typing.Union[QtGui.QTextDocument.FindFlags, QtGui.QTextDocument.FindFlag] = ...) -> bool: ...
67626762
@typing.overload
6763-
def find(self, exp: QtCore.QRegularExpression, options: typing.Union[QtGui.QTextDocument.FindFlags, QtGui.QTextDocument.FindFlag] = ...) -> bool: ...
6763+
def find(self, exp: QtCore.QRegularExpression, options: typing.Union[QtGui.QTextDocument.FindFlags, QtGui.QTextDocument.FindFlag] = ...) -> bool: ... # type: ignore
67646764
def centerOnScroll(self) -> bool: ...
67656765
def setCenterOnScroll(self, enabled: bool) -> None: ...
67666766
def backgroundVisible(self) -> bool: ...
@@ -8984,7 +8984,7 @@ class QTextEdit(QAbstractScrollArea):
89848984
@typing.overload
89858985
def find(self, exp: QtCore.QRegExp, options: typing.Union[QtGui.QTextDocument.FindFlags, QtGui.QTextDocument.FindFlag] = ...) -> bool: ...
89868986
@typing.overload
8987-
def find(self, exp: QtCore.QRegularExpression, options: typing.Union[QtGui.QTextDocument.FindFlags, QtGui.QTextDocument.FindFlag] = ...) -> bool: ...
8987+
def find(self, exp: QtCore.QRegularExpression, options: typing.Union[QtGui.QTextDocument.FindFlags, QtGui.QTextDocument.FindFlag] = ...) -> bool: ... # type: ignore
89888988
def setWordWrapMode(self, policy: QtGui.QTextOption.WrapMode) -> None: ...
89898989
def wordWrapMode(self) -> QtGui.QTextOption.WrapMode: ...
89908990
def setLineWrapColumnOrWidth(self, w: int) -> None: ...

0 commit comments

Comments
 (0)