Address most reportCallIssue found by pyright
#2333
+44
−9
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Avasam
commented
Jul 27, 2024
Avasam
commented
Jul 27, 2024
| @@ -76,7 +76,7 @@ def Reset(self): | |||
| return self._oleobj_.Reset() | |||
|
|
|||
| def Clone(self): | |||
| return self.__class__(self._oleobj_.Clone(), self.resultCLSID) | |||
| return self.__class__(self._oleobj_.Clone()) | |||
There was a problem hiding this comment.
Using the following code snippet:
import pythoncom
from win32com.client import util
catinf = pythoncom.CoCreateInstance(
pythoncom.CLSID_StdComponentCategoriesMgr,
None,
pythoncom.CLSCTX_INPROC,
pythoncom.IID_ICatInformation,
)
enum = util.Enumerator(catinf.EnumCategories())
enum.Clone()Before:
Traceback (most recent call last):
File "<stdin>", line 1, in <module>
File "C:\Program Files\Python39\lib\site-packages\win32com\client\util.py", line 78, in Clone
return self.__class__(self._oleobj_.Clone(), self.resultCLSID)
AttributeError: 'Enumerator' object has no attribute 'resultCLSID'
After:
<win32com.client.util.Enumerator object at 0x00000131BD4E1F40>
Avasam
force-pushed
the
fix-most-reportCallIssue
branch
from
28a7ac2 to
3db5527
Compare
…ost-reportCallIssue
mhammond
reviewed
Mar 4, 2025
| @@ -439,7 +441,7 @@ def ImportFile(): | |||
| # meaning sys.modules can change as a side-effect of looking at | |||
| # module.__file__ - so we must take a copy (ie, list(items())) | |||
| for key, mod in sys.modules.items(): | |||
| if getattr(mod, "__file__", None): | |||
| if hasattr(mod, "__file__") and mod.__file__: | |||
There was a problem hiding this comment.
Since dropping Python 3.7, this can be rewritten to still use getattr and still be statically safe. I've updated in the last push
Avasam
commented
Mar 10, 2025
| @@ -226,7 +226,7 @@ def currentNumberToken(self): | |||
| # quote. consumes all tokens until the end of the string | |||
| def currentQuotedString(self): | |||
| # Handle quoted strings - pity shlex doesn't handle it. | |||
| assert self.token.startswith('"'), self.token | |||
| assert self.token and self.token.startswith('"'), self.token | |||
There was a problem hiding this comment.
Improves the error message in the case where self.token is None (from an AttributeError to this AssertionError)
Avasam
commented
Mar 10, 2025
| @@ -177,7 +177,7 @@ class RCParser: | |||
| dialogs: dict[str, list[list[str | int | None | tuple[str | int, ...]]]] = {} | |||
| _dialogs: dict[str, DialogDef] = {} | |||
| debugEnabled = False | |||
| token = "" | |||
| token: str | None = "" | |||
There was a problem hiding this comment.
Reveals issues in code that assume token can't be None
Avasam
commented
Mar 10, 2025
Comment on lines
+480
to
+501
| @overload | ||
| def GetTextRange( | ||
| self, | ||
| start: int, | ||
| end: int, | ||
| decode: Literal[False], | ||
| ) -> bytes: ... | ||
| @overload | ||
| def GetTextRange( | ||
| self, | ||
| start: int = 0, | ||
| end: int = -1, | ||
| *, | ||
| decode: Literal[False], | ||
| ) -> bytes: ... | ||
| @overload | ||
| def GetTextRange( | ||
| self, | ||
| start: int = 0, | ||
| end: int = -1, | ||
| decode: Literal[True] = True, | ||
| ) -> str: ... |
There was a problem hiding this comment.
This overload makes it so callers statically know whether the return type will be str or bytes based on the decode param. (this fixes typing issues elsewhere in the code).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Address most
reportCallIssuefound by pyright. Everything left needs to be fixed in typeshed.