diff options
author | toofar <toofar@spalge.com> | 2022-08-25 08:41:16 +1200 |
---|---|---|
committer | toofar <toofar@spalge.com> | 2022-08-25 08:53:31 +1200 |
commit | d20a58c26bf741846abeb5a2f3498a57ff6c6a4f (patch) | |
tree | e8d345fd858a061a9c08b6e2bdbe2aed6809fecc /qutebrowser/utils/usertypes.py | |
parent | dfde9798074eb5ed192ff8ba074032e8a42b219a (diff) | |
download | qutebrowser-d20a58c26bf741846abeb5a2f3498a57ff6c6a4f.tar.gz qutebrowser-d20a58c26bf741846abeb5a2f3498a57ff6c6a4f.zip |
Some Qt6 mypy fixesfeat/pyqt6_and_mypy
I'm running mypy like so:
mypy --always-true=USE_PYQT6 --always-false=USE_PYQT5 --always-false=USE_PYSIDE2 --always-false=USE_PYSIDE6 --always-false=IS_QT5 --always-true=IS_QT6 qutebrowser/
And I just went down the output fixing easy stuff.
Currently I'm getting 61 errors on Qt5 and 207 errors on Qt6 (down from
230 or so).
I think the comparison ignores I removed are still needed on Qt5. I'm
not sure how best to deal with situations that need to be ignored on one
implementation and not on another. One way to do it would be to have
alternate implementations per backend, but that could become a bit or a
maintenance burden, see https://github.com/python/mypy/issues/8823
I'm also seeing some "Statement is unreachable" errors popping up which
might be due to the same scenario.
Many of the errors are related to there being no webkit on Qt6 so the
webkit modules get resolved as ANY which makes all the # type: ignore
messages be complained about. Not sure what we can do about that,
possibly something from https://mypy.readthedocs.io/en/stable/command_line.html#cmdoption-mypy-exclude
I see that Phil said we shouldn't need separate stubs for PyQt6. I'm
still using them and haven't tried without yet.
Diffstat (limited to 'qutebrowser/utils/usertypes.py')
-rw-r--r-- | qutebrowser/utils/usertypes.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qutebrowser/utils/usertypes.py b/qutebrowser/utils/usertypes.py index b84af4524..aadda000b 100644 --- a/qutebrowser/utils/usertypes.py +++ b/qutebrowser/utils/usertypes.py @@ -491,7 +491,7 @@ class AbstractCertificateErrorWrapper: """A wrapper over an SSL/certificate error.""" def __init__(self) -> None: - self._certificate_accepted = None + self._certificate_accepted: Optional[bool] = None def __str__(self) -> str: raise NotImplementedError @@ -514,7 +514,7 @@ class AbstractCertificateErrorWrapper: def defer(self) -> None: raise NotImplementedError - def certificate_was_accepted(self) -> None: + def certificate_was_accepted(self) -> bool: """Check whether the certificate was accepted by the user.""" if not self.is_overridable(): return False |