Skip to content
This repository has been archived by the owner on Apr 26, 2024. It is now read-only.

Enable --warn-redundant-casts option in mypy #14671

Merged
merged 5 commits into from
Dec 12, 2022
Merged

Enable --warn-redundant-casts option in mypy #14671

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
b4409d5
Enable `--warn-redundant-casts` option in mypy
Dec 12, 2022
1e40c3e
Changelog
Dec 12, 2022
be29fea
Fix name of the ignore
Dec 12, 2022
fe4e205
Fix one more missed cast
Dec 12, 2022
e668d3a
Remove old comment
Dec 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions mypy.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ local_partial_types = True
no_implicit_optional = True
disallow_untyped_defs = True
strict_equality = True
warn_redundant_casts = True

files =
docker/,
Expand Down
3 changes: 2 additions & 1 deletion synapse/storage/database.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -667,7 +667,8 @@ def new_transaction(
)
# also check variables referenced in func's closure
if inspect.isfunction(func):
f = cast(types.FunctionType, func)
# Keep the cast for now---it helps PyCharm to understand what `func` is.
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we would need this until PyCharm had better understanding of inspect.isfunction or something?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. There's a generic mechanism for this kind of pattern (TypeGuard). I'm not sure how well IntelliJ understands it though.

f = cast(types.FunctionType, func) # type: ignore[warn-redundant-casts]
if f.__closure__:
for i, cell in enumerate(f.__closure__):
if inspect.isgenerator(cell.cell_contents):
Expand Down
2 changes: 1 addition & 1 deletion synapse/storage/engines/postgres.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ def check_database(
# docs: The number is formed by converting the major, minor, and
# revision numbers into two-decimal-digit numbers and appending them
# together. For example, version 8.1.5 will be returned as 80105
self._version = cast(int, db_conn.server_version)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

python/typeshed#7834 is the underlying typeshed change

self._version = db_conn.server_version
allow_unsafe_locale = self.config.get("allow_unsafe_locale", False)

# Are we on a supported PostgreSQL version?
Expand Down