Skip to content

Commit f49d788

Browse files
committed
Use settings.strict and remove strict kwarg from parse_xml/load_external
This was missed during an earlier migration to a settings object
1 parent 2b127e2 commit f49d788

File tree

2 files changed

+5
-8
lines changed

2 files changed

+5
-8
lines changed

src/zeep/loader.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,7 @@ def resolve(self, url, pubid, context):
1919
return self.resolve_string(content, context)
2020

2121

22-
def parse_xml(content, transport, base_url=None, strict=True,
23-
settings=None):
22+
def parse_xml(content, transport, base_url=None, settings=None):
2423
"""Parse an XML string and return the root Element.
2524
2625
:param content: The XML string
@@ -37,7 +36,7 @@ def parse_xml(content, transport, base_url=None, strict=True,
3736
3837
"""
3938
settings = settings or Settings()
40-
recover = not strict
39+
recover = not settings.strict
4140
parser = etree.XMLParser(
4241
remove_comments=True, resolve_entities=False,
4342
recover=recover, huge_tree=settings.xml_huge_tree)
@@ -56,7 +55,7 @@ def parse_xml(content, transport, base_url=None, strict=True,
5655
)
5756

5857

59-
def load_external(url, transport, base_url=None, strict=True, settings=None):
58+
def load_external(url, transport, base_url=None, settings=None):
6059
"""Load an external XML document.
6160
6261
:param url:
@@ -74,7 +73,7 @@ def load_external(url, transport, base_url=None, strict=True, settings=None):
7473
url = absolute_location(url, base_url)
7574
content = transport.load(url)
7675
return parse_xml(
77-
content, transport, base_url, strict=strict, settings=settings)
76+
content, transport, base_url, settings=settings)
7877

7978

8079
def absolute_location(location, base):

src/zeep/xsd/schema.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -114,9 +114,7 @@ def add_documents(self, schema_nodes, location):
114114

115115
def add_document_by_url(self, url):
116116
schema_node = load_external(
117-
url,
118-
self._transport,
119-
strict=self.settings.strict)
117+
url, self._transport, settings=self.settings)
120118

121119
document = self.create_new_document(schema_node, url=url)
122120
document.resolve()

0 commit comments

Comments
 (0)