未验证 提交 9b1f86b6 编写于 作者: A Andrey Rahmatullin 提交者: GitHub

Use f-strings

上级 9731d91f
...@@ -35,7 +35,7 @@ def xmliter(obj, nodename): ...@@ -35,7 +35,7 @@ def xmliter(obj, nodename):
namespaces = {} namespaces = {}
if header_end: if header_end:
for tagname in reversed(re.findall(END_TAG_RE, header_end)): for tagname in reversed(re.findall(END_TAG_RE, header_end)):
tag = re.search(r'<\s*%s.*?xmlns[:=][^>]*>' % tagname, text[:header_end_idx[1]], re.S) tag = re.search(fr'<\s*{tagname}.*?xmlns[:=][^>]*>', text[:header_end_idx[1]], re.S)
if tag: if tag:
namespaces.update(reversed(x) for x in re.findall(NAMESPACE_RE, tag.group())) namespaces.update(reversed(x) for x in re.findall(NAMESPACE_RE, tag.group()))
...@@ -45,7 +45,7 @@ def xmliter(obj, nodename): ...@@ -45,7 +45,7 @@ def xmliter(obj, nodename):
document_header document_header
+ match.group().replace( + match.group().replace(
nodename, nodename,
'%s %s' % (nodename, ' '.join(namespaces.values())), f'{nodename} {" ".join(namespaces.values())}',
1 1
) )
+ header_end + header_end
...@@ -56,7 +56,7 @@ def xmliter(obj, nodename): ...@@ -56,7 +56,7 @@ def xmliter(obj, nodename):
def xmliter_lxml(obj, nodename, namespace=None, prefix='x'): def xmliter_lxml(obj, nodename, namespace=None, prefix='x'):
from lxml import etree from lxml import etree
reader = _StreamReader(obj) reader = _StreamReader(obj)
tag = f'{{{namespace}}}{nodename}'if namespace else nodename tag = f'{{{namespace}}}{nodename}' if namespace else nodename
iterable = etree.iterparse(reader, tag=tag, encoding=reader.encoding) iterable = etree.iterparse(reader, tag=tag, encoding=reader.encoding)
selxpath = '//' + (f'{prefix}:{nodename}' if namespace else nodename) selxpath = '//' + (f'{prefix}:{nodename}' if namespace else nodename)
for _, node in iterable: for _, node in iterable:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册