From cdfe726ab61bd8c7188fe0a6b52697b2cd954296 Mon Sep 17 00:00:00 2001 From: Paul Sokolovsky Date: Sat, 10 Oct 2015 13:10:11 +0300 Subject: [PATCH] xmltok: Make text_of() support namespaced tags. --- xmltok/xmltok.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xmltok/xmltok.py b/xmltok/xmltok.py index 62965421..d8b5d015 100644 --- a/xmltok/xmltok.py +++ b/xmltok/xmltok.py @@ -115,7 +115,15 @@ def gfind(gen, pred): def text_of(gen, tag): # Return text content of a leaf tag - gfind(gen, lambda i: i == (START_TAG, tag)) + def match_tag(t): + if t[0] != START_TAG: + return False + if isinstance(tag, ()): + return t[1] == tag + return t[1][1] == tag + + gfind(gen, match_tag) + # Assumes no attributes t, val = next(gen) assert t == TEXT return val