LBRYCommunity/aioupnp
1
0
Fork 0
Code Issues 7 Pull requests 1 Projects Releases 1 Packages Wiki Activity

Fix uncaught ConnectionError in scpd_post and scpd_get #22

Merged
jackrobison merged 3 commits from catch-connection-error into master 2020-01-15 22:37:03 +01:00
Conversation 1 Commits 3 Files changed 6 +3 -3
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 6d52d76af6 - Show all commits

6
aioupnp/serialization/scpd.py
View file

@ -7,7 +7,7 @@ from aioupnp.util import flatten_keys
CONTENT_PATTERN = re.compile( CONTENT_PATTERN = re.compile(
"(\<\?xml version=\"1\.0\"\?\>(\s*.)*|\>)".encode() "(\<\?xml version=\"1\.0\"\?\>(\s*.)*|\>)"
) )
XML_ROOT_SANITY_PATTERN = re.compile( XML_ROOT_SANITY_PATTERN = re.compile(
@ -39,8 +39,8 @@ def serialize_scpd_get(path: str, address: str) -> bytes:
def deserialize_scpd_get_response(content: bytes) -> Dict[str, Any]: def deserialize_scpd_get_response(content: bytes) -> Dict[str, Any]:
if XML_VERSION.encode() in content: if XML_VERSION.encode() in content:
parsed: List[Tuple[bytes, bytes]] = CONTENT_PATTERN.findall(content) parsed: List[Tuple[bytes, bytes]] = CONTENT_PATTERN.findall(content.decode())
xml_dict = xml_to_dict((b'' if not parsed else parsed[0][0]).decode()) xml_dict = xml_to_dict('' if not parsed else parsed[0][0])
return parse_device_dict(xml_dict) return parse_device_dict(xml_dict)
return {} return {}