Merge pull request python-qt-tools#129 from TilmanK/master

bluebird75 · Feb 16, 2021 · ca4ea71 · ca4ea71
2 parents ddc409b + 616b129
commit ca4ea71
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -17,6 +17,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 * [#51](https://github.com/stlehmann/PyQt5-stubs/pull/51) adds `pyqtBoundSignal.signal` hinted as `str`
 
 ### Changed
+* [#129](https://github.com/stlehmann/PyQt5-stubs/pull/129) fixes `QThread` and `QNetworkAccessManager` signals
 * [#109](https://github.com/stlehmann/PyQt5-stubs/pull/109) `.__or__()` for `QMessageBox.StandardButton` and `QMessageBox.StandardButtons`
 * [#126](https://github.com/stlehmann/PyQt5-stubs/pull/126) fix `QCoreApplication.instance()` return type to be optional
 * [#102](https://github.com/stlehmann/PyQt5-stubs/pull/102) fix `pyqtSlot` parameter typing and overloads

diff --git a/PyQt5-stubs/QtCore.pyi b/PyQt5-stubs/QtCore.pyi
@@ -8247,8 +8247,8 @@ class QThread(QObject):
     def exec(self) -> int: ...
     def exec_(self) -> int: ...
     def run(self) -> None: ...
-    def finished(self) -> None: ...
-    def started(self) -> None: ...
+    finished: typing.ClassVar[pyqtSignal]
+    started: typing.ClassVar[pyqtSignal]
     @typing.overload
     def wait(self, msecs: int = ...) -> bool: ...
     @typing.overload

diff --git a/PyQt5-stubs/QtNetwork.pyi b/PyQt5-stubs/QtNetwork.pyi
@@ -764,13 +764,13 @@ class QNetworkAccessManager(QtCore.QObject):
     def setProxyFactory(self, factory: 'QNetworkProxyFactory') -> None: ...
     def proxyFactory(self) -> 'QNetworkProxyFactory': ...
     def createRequest(self, op: 'QNetworkAccessManager.Operation', request: 'QNetworkRequest', device: typing.Optional[QtCore.QIODevice] = ...) -> 'QNetworkReply': ...
-    def preSharedKeyAuthenticationRequired(self, reply: 'QNetworkReply', authenticator: 'QSslPreSharedKeyAuthenticator') -> None: ...
-    def networkAccessibleChanged(self, accessible: 'QNetworkAccessManager.NetworkAccessibility') -> None: ...
-    def sslErrors(self, reply: 'QNetworkReply', errors: typing.Iterable['QSslError']) -> None: ...
-    def encrypted(self, reply: 'QNetworkReply') -> None: ...
-    def finished(self, reply: 'QNetworkReply') -> None: ...
-    def authenticationRequired(self, reply: 'QNetworkReply', authenticator: QAuthenticator) -> None: ...
-    def proxyAuthenticationRequired(self, proxy: 'QNetworkProxy', authenticator: QAuthenticator) -> None: ...
+    preSharedKeyAuthenticationRequired = typing.ClassVar[QtCore.pyqtSignal]
+    networkAccessibleChanged = typing.ClassVar[QtCore.pyqtSignal]
+    sslErrors: typing.ClassVar[QtCore.pyqtSignal]
+    encrypted: typing.ClassVar[QtCore.pyqtSignal]
+    finished: typing.ClassVar[QtCore.pyqtSignal]
+    authenticationRequired: typing.ClassVar[QtCore.pyqtSignal]
+    proxyAuthenticationRequired: typing.ClassVar[QtCore.pyqtSignal]
     @typing.overload
     def put(self, request: 'QNetworkRequest', data: QtCore.QIODevice) -> 'QNetworkReply': ...
     @typing.overload