From 74027d3395da78a596053ecb3454cbd9815fcd46 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Fri, 16 Sep 2022 14:34:27 +0200 Subject: Drop certificateerror.create factory function Now that the two implementations are in the same class, there's no need for the indirection anymore. Follow-up to 647b74197a779e00cae1847654796581df28a7b0. --- qutebrowser/browser/webengine/certificateerror.py | 5 ----- qutebrowser/browser/webengine/webview.py | 2 +- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/qutebrowser/browser/webengine/certificateerror.py b/qutebrowser/browser/webengine/certificateerror.py index 5484d921d..0dbd91ccb 100644 --- a/qutebrowser/browser/webengine/certificateerror.py +++ b/qutebrowser/browser/webengine/certificateerror.py @@ -79,8 +79,3 @@ class CertificateErrorWrapper(usertypes.AbstractCertificateErrorWrapper): # WORKAROUND for https://www.riverbankcomputing.com/pipermail/pyqt/2022-April/044585.html # (PyQt 5.15.6, 6.2.3, 6.3.0) raise usertypes.UndeferrableError("PyQt bug") - - -def create(error: QWebEngineCertificateError) -> CertificateErrorWrapper: - """Factory function picking the right class based on Qt version.""" - return CertificateErrorWrapper(error) diff --git a/qutebrowser/browser/webengine/webview.py b/qutebrowser/browser/webengine/webview.py index fdce9f8e9..b2468ae6a 100644 --- a/qutebrowser/browser/webengine/webview.py +++ b/qutebrowser/browser/webengine/webview.py @@ -214,7 +214,7 @@ class WebEnginePage(QWebEnginePage): @pyqtSlot(QWebEngineCertificateError) def _handle_certificate_error(self, qt_error): """Handle certificate errors coming from Qt.""" - error = certificateerror.create(qt_error) + error = certificateerror.CertificateErrorWrapper(qt_error) self.certificate_error.emit(error) # Right now, we never defer accepting, due to a PyQt bug return error.certificate_was_accepted() -- cgit v1.2.3-54-g00ecf