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.

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

Migrate bracketed IP addresses in ZHA config entry #95917

Merged
merged 4 commits into from
Jul 6, 2023
Merged

Migrate bracketed IP addresses in ZHA config entry #95917

merged 4 commits into from
Jul 6, 2023

Conversation

puddly
Copy link
Contributor

@puddly puddly commented Jul 5, 2023

Proposed change

CPython 3.11.4 exposed a URI parsing bug in previous versions (python/cpython#103848) that allowed for bracketed IP addresses like socket://[1.2.3.4]:5678 to erroneously be parsed correctly. This PR automatically fixes these URIs (and also removes stale migration code scheduled to be removed in 2023.7.0).

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)
  • Deprecation (breaking change to happen in the future)
  • 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
  • I have followed the perfect PR recommendations
  • 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.

To help with the load of incoming pull requests:

@puddly puddly added this to the 2023.7.1 milestone Jul 5, 2023
@home-assistant
Copy link

home-assistant bot commented Jul 5, 2023

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!

Code owner commands

Code owners of zha can trigger bot actions by commenting:

  • @home-assistant close Closes the pull request.
  • @home-assistant rename Awesome new title Renames the pull request.
  • @home-assistant reopen Reopen the pull request.
  • @home-assistant unassign zha Removes the current integration label and assignees on the pull request, add the integration domain after the command.

@puddly puddly mentioned this pull request Jul 5, 2023
Closed
Adminiuga
Adminiuga reviewed Jul 5, 2023
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

homeassistant/components/zha/__init__.py Outdated Show resolved Hide resolved
Adminiuga
Adminiuga approved these changes Jul 5, 2023
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

@balloob balloob merged commit ecc0917 into home-assistant:dev Jul 6, 2023
balloob pushed a commit that referenced this pull request Jul 6, 2023
@puddly @balloob
Migrate bracketed IP addresses in ZHA config entry (#95917)
6275932 
* Automatically correct IP addresses surrounded by brackets

* Simplify regex

* Move pattern inline

* Maintain old behavior of stripping whitespace
@balloob balloob mentioned this pull request Jul 6, 2023
Merged
joostlek pushed a commit to joostlek/core that referenced this pull request Jul 6, 2023
@puddly @joostlek
Migrate bracketed IP addresses in ZHA config entry (home-assistant#95917
f43d103 
)

* Automatically correct IP addresses surrounded by brackets

* Simplify regex

* Move pattern inline

* Maintain old behavior of stripping whitespace
@github-actions github-actions bot locked and limited conversation to collaborators Jul 7, 2023
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
bugfix by-code-owner cherry-picked cla-signed has-tests integration: zha Quality Scale: No score small-pr PRs with less than 30 lines.
Projects
None yet
Milestone
2023.7.1
Development

Successfully merging this pull request may close these issues.

Zigbee devices no longer working in 2023.6.2
4 participants
@puddly @Adminiuga @dmulcahey @balloob