Skip to content

fix: narrow write_multi_vars item types #855

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

Open
gijzelaerr wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: narrow write_multi_vars item types #855

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions snap7/client.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1383,9 +1383,10 @@ def write_multi_vars(self, items: Union[List[dict[str, Any]], List[S7DataItem]])
raise ValueError(f"Too many items: {len(items)} exceeds MAX_VARS ({self.MAX_VARS})")

# Handle S7DataItem list (ctypes)
if hasattr(items[0], "Area"):
s7_items = cast(List[S7DataItem], items)
for s7_item in s7_items:
if isinstance(items[0], S7DataItem):
for s7_item in items:
if not isinstance(s7_item, S7DataItem):
raise TypeError("items must contain either only S7DataItem objects or only dictionaries")
area = Area(s7_item.Area)
db_number = s7_item.DBNumber
start = s7_item.Start
Expand All @@ -1401,8 +1402,9 @@ def write_multi_vars(self, items: Union[List[dict[str, Any]], List[S7DataItem]])
return 0

# Handle dict list
dict_items = cast(List[dict[str, Any]], items)
for dict_item in dict_items:
for dict_item in items:
if not isinstance(dict_item, dict):
raise TypeError("items must contain either only S7DataItem objects or only dictionaries")
area = dict_item["area"]
db_number = dict_item.get("db_number", 0)
start = dict_item["start"]
Expand Down
Loading