Skip to content

Default to text/xml if server doesn't return a Content-Type #977

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

Merged
geographika merged 1 commit into from
Mar 6, 2025
Merged

Default to text/xml if server doesn't return a Content-Type #977

Show file tree
Hide file tree
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
3 changes: 2 additions & 1 deletion owslib/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,8 @@ def getXMLTree(rsp: ResponseWrapper) -> etree:
et = etree.fromstring(raw_text)

# check for response type - if it is not xml then raise an error
content_type = rsp.info()['Content-Type']
# if the server doesn't provide a Content-Type then assume xml
content_type = rsp.info().get('Content-Type', 'text/xml')
url = rsp.geturl()

xml_types = ['text/xml', 'application/xml', 'application/vnd.ogc.wms_xml']
Expand Down
13 changes: 13 additions & 0 deletions tests/test_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,19 @@ def test_getXMLTree_valid():
assert et.find('.//Title').text == "Example"


def test_getXMLTree_valid_missing_content_type():

mock_resp = mock.Mock()
mock_resp.url = 'http:///example.org/?service=WFS&request=GetCapabilities&version=2.0.0'
mock_resp.content = b'<?xml version="1.0" encoding="UTF-8"?>\n<WFS_Capabilities><ServiceIdentification>' \
b'<Title>Example</Title></ServiceIdentification></WFS_Capabilities>'
mock_resp.headers = {}
resp_wrap = ResponseWrapper(mock_resp)

et = getXMLTree(resp_wrap)
assert et.find('.//Title').text == "Example"


def test_getXMLTree_invalid():

mock_resp = mock.Mock()
Expand Down