Merge branch 'master' into release

This commit is contained in:
Knoch 2020-02-08 16:57:55 +01:00
commit 9096a1b0d5

View File

@ -4,8 +4,7 @@ import string
from lxml import etree from lxml import etree
FRAGMENT_PREFIX = "in" FRAGMENT_TAG = "+?"
FRAGMENT_TAG = ";%s" % FRAGMENT_PREFIX
FRAGMENT_CLASS = "fragment" FRAGMENT_CLASS = "fragment"
# Search and delete the FRAGMENT_TAG anywhere in the given HTML # Search and delete the FRAGMENT_TAG anywhere in the given HTML
@ -23,7 +22,7 @@ def defragmentize(html):
class_list += " %s" % FRAGMENT_CLASS class_list += " %s" % FRAGMENT_CLASS
fragment.set('class', class_list) fragment.set('class', class_list)
fragment.text = re.sub(r"\s*;%s\s*" % FRAGMENT_PREFIX, '', fragment.text).strip() fragment.text = re.sub(r"\s*%s\s*" % re.escape(FRAGMENT_TAG), '', fragment.text).strip()
return etree.tostring(dom, method='html', encoding='utf-8', return etree.tostring(dom, method='html', encoding='utf-8',
pretty_print=True).decode('utf-8') pretty_print=True).decode('utf-8')