evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert fix MultiDict typing with multidict-6.0.0 (#64733) (#64792)

Browse source 
* revert #64733

* pin down multidict to < 6.0.0
This commit is contained in:
Michael 2022-01-23 23:22:16 +01:00 • committed by GitHub
parent 425911e850
commit 2f0059fa8b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/package_constraints.txt
View file

@ -95,3 +95,7 @@ pytest_asyncio==1000000000.0.0
# https://github.com/jkeljo/sisyphus-control/issues/6 # https://github.com/jkeljo/sisyphus-control/issues/6
python-engineio>=3.13.1,<4.0 python-engineio>=3.13.1,<4.0
python-socketio>=4.6.0,<5.0 python-socketio>=4.6.0,<5.0
# Constrain multidict to avoid typing issues
# https://github.com/home-assistant/core/pull/64792
multidict<6.0.0

6
homeassistant/util/aiohttp.py
View file

@ -44,13 +44,13 @@ class MockRequest:
self.method = method self.method = method
self.url = url self.url = url
self.status = status self.status = status
self.headers: CIMultiDict[str, str] = CIMultiDict(headers or {}) self.headers: CIMultiDict[str] = CIMultiDict(headers or {})
self.query_string = query_string or "" self.query_string = query_string or ""
self._content = content self._content = content
self.mock_source = mock_source self.mock_source = mock_source
@property @property
def query(self) -> MultiDict[str, str]: def query(self) -> MultiDict[str]:
"""Return a dictionary with the query variables.""" """Return a dictionary with the query variables."""
return MultiDict(parse_qsl(self.query_string, keep_blank_values=True)) return MultiDict(parse_qsl(self.query_string, keep_blank_values=True))
@ -68,7 +68,7 @@ class MockRequest:
"""Return the body as JSON.""" """Return the body as JSON."""
return json.loads(self._text) return json.loads(self._text)
async def post(self) -> MultiDict[str, str]: async def post(self) -> MultiDict[str]:
"""Return POST parameters.""" """Return POST parameters."""
return MultiDict(parse_qsl(self._text, keep_blank_values=True)) return MultiDict(parse_qsl(self._text, keep_blank_values=True))

4
script/gen_requirements_all.py
View file

@ -120,6 +120,10 @@ pytest_asyncio==1000000000.0.0
# https://github.com/jkeljo/sisyphus-control/issues/6 # https://github.com/jkeljo/sisyphus-control/issues/6
python-engineio>=3.13.1,<4.0 python-engineio>=3.13.1,<4.0
python-socketio>=4.6.0,<5.0 python-socketio>=4.6.0,<5.0
# Constrain multidict to avoid typing issues
# https://github.com/home-assistant/core/pull/64792
multidict<6.0.0
""" """
IGNORE_PRE_COMMIT_HOOK_ID = ( IGNORE_PRE_COMMIT_HOOK_ID = (