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

Fix subscriptable type usage in Python <3.9 #15604

Merged
merged 3 commits into from
May 16, 2023
Merged

Fix subscriptable type usage in Python <3.9 #15604

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3574071
Fix subscriptable dict type
MadLittleMods May 15, 2023
2291104
Fix subscriptable Counter usage in Python <3.9
MadLittleMods May 15, 2023
113455e
Add changelog
MadLittleMods May 15, 2023
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 changelog.d/15604.misc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix subscriptable type usage in Python <3.9.
3 changes: 1 addition & 2 deletions synapse/storage/controllers/stats.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
# limitations under the License.

import logging
from collections import Counter
from typing import TYPE_CHECKING, Collection, List, Tuple
from typing import TYPE_CHECKING, Collection, Counter, List, Tuple
Copy link
Member

Choose a reason for hiding this comment

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

I'm somewhat surprised this works and that you don't need to separately import Counter from collections and typing!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Should we worry at all? Maybe this doesn't have any tests 🤔

We do this elsewhere which I can align with:

synapse/synapse/handlers/stats.py

Lines 16 to 19 in 0ccfb93

from collections import Counter
from typing import TYPE_CHECKING, Any, Dict, Iterable, Optional, Tuple
from typing_extensions import Counter as CounterType

synapse/synapse/storage/prepare_database.py

Lines 18 to 22 in 0ccfb93

from collections import Counter
from typing import Collection, Generator, Iterable, List, Optional, TextIO, Tuple
import attr
from typing_extensions import Counter as CounterType

Copy link
Member

Choose a reason for hiding this comment

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

I don't think we need to worry about it:

>>> from typing import Counter as CounterType
>>> from collections import Counter
>>> x = CounterType()
>>> isinstance(x, Counter)
True

Just a weird way to do it, I guess this is why they're making them scriptable.


from synapse.api.errors import SynapseError
from synapse.storage.database import LoggingTransaction
Expand Down
2 changes: 1 addition & 1 deletion tests/test_state.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -264,7 +264,7 @@ def test_branch_no_conflict(self) -> Generator[defer.Deferred, Any, None]:

self.dummy_store.register_events(graph.walk())

context_store: dict[str, EventContext] = {}
context_store: Dict[str, EventContext] = {}

for event in graph.walk():
context = yield defer.ensureDeferred(
Expand Down