Skip to content
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.

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

Already on GitHub? Sign in to your account

Fix iCloud device battery level can be None #31468

Merged

Conversation

Quentame
Copy link
Member

@Quentame Quentame commented Feb 4, 2020

Proposed change

Fix this error :

   File "/usr/src/homeassistant/homeassistant/components/icloud/__init__.py", line 514, in update
     self._battery_level = int(self._status.get(DEVICE_BATTERY_LEVEL, 0) * 100)
 TypeError: unsupported operand type(s) for *: 'NoneType' and 'int'

It appears that a retrieved device can have a battery status not "Unknown" with a battery level to None on the API side, maybe the Apple Watch (which I can't test on).

So just checking the None value before setting a battery level.

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

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.
  • Untested files have been added to .coveragerc.

The integration reached or maintains the following Integration Quality Scale:

  • No score or internal
  • 馃 Silver
  • 馃 Gold
  • 馃弳 Platinum

@project-bot project-bot bot added this to Needs review in Dev Feb 4, 2020
@project-bot project-bot bot moved this from Needs review to By Code Owner in Dev Feb 4, 2020
Dev automation moved this from By Code Owner to Reviewer approved Feb 4, 2020
@balloob balloob added this to the 0.105.0 milestone Feb 4, 2020
@Quentame Quentame merged commit 2c439af into home-assistant:dev Feb 4, 2020
Dev automation moved this from Reviewer approved to Done Feb 4, 2020
@Quentame Quentame deleted the icloud/fix-battery-level-None branch February 4, 2020 23:26
@lock lock bot locked and limited conversation to collaborators Feb 6, 2020
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
Dev
  
Done
Development

Successfully merging this pull request may close these issues.

Error setting up iCloud
4 participants