Skip to content

Commit 9c46fbd

Browse files
committed
gh-148427: Revert finally clause, remove stack assertion
Drop the finally clause per reviewer feedback — the stack cleanup behavior change is a separate concern. Remove the entity stack assertion that depended on it.
1 parent 55e6890 commit 9c46fbd

2 files changed

Lines changed: 3 additions & 4 deletions

File tree

Lib/test/test_sax.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1078,7 +1078,6 @@ def raise_on_entity(name, attrs):
10781078

10791079
if issubclass(exc_type, Exception):
10801080
self.assertRaises(SAXParseException, parser.feed, trigger)
1081-
self.assertEqual(len(parser._entity_stack), 0)
10821081
else:
10831082
with self.assertRaisesRegex(exc_type, "test"):
10841083
parser.feed(trigger)

Lib/xml/sax/expatreader.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -426,9 +426,9 @@ def external_entity_ref(self, context, base, sysid, pubid):
426426
xmlreader.IncrementalParser.parse(self, source)
427427
except Exception:
428428
return 0 # FIXME: save error info here?
429-
finally:
430-
(self._parser, self._source) = self._entity_stack[-1]
431-
del self._entity_stack[-1]
429+
430+
(self._parser, self._source) = self._entity_stack[-1]
431+
del self._entity_stack[-1]
432432
return 1
433433

434434
def skipped_entity_handler(self, name, is_pe):

0 commit comments

Comments
 (0)