8000 Fix mypy issues in zha store by epenet · Pull Request #74032 · home-assistant/core · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix mypy issues in zha store #74032

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

Jump to bottom
Merged
merged 1 commit into from
Jun 28, 2022
Merged

Fix mypy issues in zha store #74032

merged 1 commit into from
Jun 28, 2022

Conversation

epenet
Copy link
Contributor
@epenet epenet commented Jun 27, 2022 •
edited
Loading

Proposed change

Fix mypy issues in zha store
Linked to #73603

Type of change

  • Dependency upgrade
  • Bugfix (non-breaking change which fixes an issue)
  • New integration (thank you!)
  • New feature (which adds functionality to an existing integration)
  • Breaking change (fix/feature causing existing functionality to break)
  • Code quality improvements to existing code or addition of tests

Additional information

  • This PR fixes or closes issue: fixes #
  • This PR is related to issue:
  • Link to documentation pull request:

Checklist

  • The code change is tested and works locally.
  • Local tests pass. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist
  • The code has been formatted using Black (black --fast homeassistant tests)
  • Tests have been added to verify that the new code works.

If user exposed functionality or configuration variables are added/changed:

If the code communicates with devices, web services, or third-party tools:

  • The manifest file has all fields filled out correctly.
    Updated and included derived files by running: python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt.
    Updated by running python3 -m script.gen_requirements_all.
  • For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
  • Untested files have been added to .coveragerc.

The integration reached or maintains the following Integration Quality Scale:

  • No score or internal
  • 🥈 Silver
  • 🥇 Gold
  • 🏆 Platinum

To help with the load of incoming pull requests:

@probot-home-assistant
Copy link

Hey there @dmulcahey, @Adminiuga, mind taking a look at this pull request as it has been labeled with an integration (zha) you are listed as a code owner for? Thanks!
(message by CodeOwnersMention)

epenet
epenet commented Jun 27, 2022
View reviewed changes
homeassistant/components/zha/core/store.py
Comment on lines +85 to +86
if device.last_seen is None:
return old
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Hi @Adminiuga / @dmulcahey

I am not sure of the logic here inside async_update_device
old cannot ever be None so I have removed the check for if old is not None

From what I could make out, the code in gateway would be happy to return None.

core/homeassistant/components/zha/core/gateway.py

Lines 553 to 556 in aa314a0

async def async_update_device_storage(self, *_: Any) -> None:
"""Update the devices in the store."""
for device in self.devices.values():
self.zha_storage.async_update_device(device)

But the internal code in async_create_or_update_device definitely expects a value to be returned.

core/homeassistant/components/zha/core/store.py

Lines 64 to 68 in aa314a0

def async_create_or_update_device(self, device: ZHADevice) -> ZhaDeviceEntry:
"""Create or update a ZhaDeviceEntry."""
if str(device.ieee) in self.devices:
return self.async_update_device(device)
return self.async_create_device(device)

@epenet epenet mentioned this pull request Jun 27, 2022
Merged
38 tasks
Adminiuga
Adminiuga approved these changes Jun 27, 2022
View reviewed changes
Copy link
Contributor
@Adminiuga Adminiuga left a comment

Choose a reason for hiding this comment

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

Lgtm

@frenck frenck force-pushed the Fix-mypy-issues-in-zha-store branch from 8800a44 to 9602741 Compare June 27, 2022 22:56
@frenck frenck added the smash Indicator this PR is close to finish for merging or closing label Jun 27, 2022
@frenck
Copy link
Member
frenck commented Jun 28, 2022

Needs #74079 to get the CI pass

@epenet epenet closed this Jun 28, 2022
@epenet epenet reopened this Jun 28, 2022
@frenck frenck merged commit 87b46a6 into home-assistant:dev Jun 28, 2022
@epenet epenet deleted the Fix-mypy-issues-in-zha-store branch June 28, 2022 06:53
@github-actions github-actions bot locked and limited conversation to collaborators Jun 29, 2022
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@Adminiuga Adminiuga Adminiuga approved these changes

@dmulcahey dmulcahey Awaiting requested review from dmulcahey dmulcahey is a code owner

Assignees

@dmulcahey dmulcahey

@Adminiuga Adminiuga

Labels
cla-signed code-quality integration: zha small-pr PRs with less than 30 lines. smash Indicator this PR is close to finish for merging or closing
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@epenet @frenck @Adminiuga @dmulcahey @homeassistant
0