Skip to content

Small typing cleanups #7716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jenshnielsen merged 2 commits into from
Dec 15, 2025
Merged

Small typing cleanups #7716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1565d83
Add missing generic arg
jenshnielsen Dec 13, 2025
eb56b9c
remove unused type ignore
jenshnielsen Dec 11, 2025
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
6 changes: 1 addition & 5 deletions src/qcodes/logger/instrument_logger.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,11 +85,7 @@ def process(
full_name = getattr(inst, "full_name", None)
instr_type = str(type(inst).__name__)

# merge_extra is a bool attribute in 3.13 and later
# but not included in the typestub see
# https://github.com/python/typeshed/pull/14197
# this makes it a type checking error in 3.13 but not in earlier versions
if self.merge_extra and "extra" in kwargs: # type: ignore[attr-defined,unused-ignore]
if self.merge_extra and "extra" in kwargs:
kwargs["extra"] = {**extra, **kwargs["extra"]}
else:
kwargs["extra"] = extra
Expand Down
4 changes: 2 additions & 2 deletions src/qcodes/parameters/parameter_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1317,7 +1317,7 @@ def __call__(self) -> ParamDataType:


# Does not implement __hash__, not clear it needs to
class ParameterSet(MutableSet, Generic[P]): # noqa: PLW1641
class ParameterSet(MutableSet[P], Generic[P]): # noqa: PLW1641
"""A set-like container that preserves the insertion order of its parameters.

This class implements the common set interface methods while maintaining
Expand All @@ -1343,7 +1343,7 @@ def discard(self, value: P) -> None:
def clear(self) -> None:
self._dict.clear()

def pop(self) -> ParameterBase:
def pop(self) -> P:
if not self._dict:
raise KeyError("pop from an empty ParameterSet")
item = next(iter(self._dict))
Expand Down
Loading