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’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Vicare imports #29071

Merged
merged 4 commits into from Nov 26, 2019
Merged

Fix Vicare imports #29071

merged 4 commits into from Nov 26, 2019

Conversation

@rappenze
Copy link
Contributor

rappenze commented Nov 25, 2019

Description:

Fix imports. Dependent on the installed libraries different json packages have to be imported.

Related issue (if applicable):
fixes #29070

Pull request with documentation for home-assistant.io (if applicable): home-assistant/home-assistant.io#<home-assistant.io PR number goes here>

Example entry for configuration.yaml (if applicable):

Checklist:

  • The code change is tested and works locally.
  • Local tests pass with tox. Your PR cannot be merged unless tests pass
  • There is no commented out code in this PR.
  • I have followed the development checklist

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. Update and include derived files by running python3 -m script.hassfest.
  • New or updated dependencies have been added to requirements_all.txt by running python3 -m script.gen_requirements_all.
  • Untested files have been added to .coveragerc.

If the code does not interact with devices:

  • Tests have been added to verify that the new code works.
rappenze added 2 commits Nov 25, 2019
@homeassistant

This comment has been minimized.

Copy link
Contributor

homeassistant commented Nov 25, 2019

Hi @rappenze,

It seems you haven't yet signed a CLA. Please do so here.

Once you do that we will be able to review and accept this pull request.

Thanks!

@probot-home-assistant

This comment has been minimized.

Copy link

probot-home-assistant bot commented Nov 25, 2019

Hey there @oischinger, mind taking a look at this pull request as its been labeled with a integration (vicare) you are listed as a codeowner for? Thanks!

@homeassistant homeassistant added cla-signed and removed cla-needed labels Nov 25, 2019
@@ -169,7 +175,7 @@ def update(self):
] = self._api.getReturnTemperature()
except requests.exceptions.ConnectionError:
_LOGGER.error("Unable to retrieve data from ViCare server")
except simplejson.errors.JSONDecodeError:
except JSONDecodeError:

This comment has been minimized.

Copy link
@balloob

balloob Nov 26, 2019

Member

Change this to ValueError, which both JSONDecodeErrors inherit from.

@MartinHjelmare MartinHjelmare added this to Review in progress in Dev Nov 26, 2019
@MartinHjelmare MartinHjelmare changed the title Vicare import fix Fix Vicare imports Nov 26, 2019
rappenze added 2 commits Nov 26, 2019
@rappenze rappenze requested a review from balloob Nov 26, 2019
Dev automation moved this from Review in progress to Reviewer approved Nov 26, 2019
@balloob balloob merged commit 1c73ac5 into home-assistant:dev Nov 26, 2019
11 checks passed
11 checks passed
CI #20191126.77 succeeded
Details
CI (FullCheck Mypy) FullCheck Mypy succeeded
Details
CI (FullCheck Pylint) FullCheck Pylint succeeded
Details
CI (Overview CheckFormat) Overview CheckFormat succeeded
Details
CI (Overview Lint) Overview Lint succeeded
Details
CI (Overview Validate) Overview Validate succeeded
Details
CI (Tests PyTest Python36) Tests PyTest Python36 succeeded
Details
CI (Tests PyTest Python37) Tests PyTest Python37 succeeded
Details
cla-bot Everyone involved has signed the CLA
codecov/patch Coverage not affected when comparing 3dd5222...80af144
Details
codecov/project 94.49% (target 90%)
Details
Dev automation moved this from Reviewer approved to Done Nov 26, 2019
@lock lock bot locked and limited conversation to collaborators Nov 27, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
Dev
  
Done
4 participants
You can’t perform that action at this time.