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

refactor: honor conclusive response Content-Types #149

Merged
merged 1 commit into from
Oct 8, 2022
Merged

refactor: honor conclusive response Content-Types #149

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 20 additions & 3 deletions huawei_lte_api/Session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from email.message import EmailMessage
import json
import logging
import re
Expand Down Expand Up @@ -92,9 +93,25 @@ def _create_request_xml(data: Union[dict, list, int]) -> bytes:
def _process_response_data(response: requests.Response) -> dict:
data = response.content

# Some endpoints respond with JSON, some XML, but the Content-Type is always
# text/html, so we resort to content sniffing.
if data and data.startswith(b'{'):
is_json = None
content_type = response.headers.get('Content-Type')
if content_type:
# Weed out Content-Type parameters with EmailMessage
# (cgi.parse_header is deprecated as of Python 3.11)
msg = EmailMessage()
msg['Content-Type'] = content_type
content_type = msg.get_content_type()
if content_type.endswith('/json') or content_type.endswith('+json'):
is_json = True
elif content_type.endswith('/xml') or content_type.endswith('+xml'):
is_json = False
# Others are not conclusive, e.g. text/html may have JSON or XML

# Resort to content sniffing if Content-Type wasn't conclusive
if is_json is None and data and data.startswith(b'{'):
is_json = True

if is_json:
return json.loads(data)

# In some cases unsupported methods, e.g. in config namespace,
Expand Down