Hope this is better...
This commit is contained in:
parent
eb3e21b0bc
commit
e5ebb0d364
18
planet/vendor/feedparser.py
vendored
18
planet/vendor/feedparser.py
vendored
@ -2333,21 +2333,13 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
|
|||||||
valid_css_values = re.compile('^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|' +
|
valid_css_values = re.compile('^(#[0-9a-f]+|rgb\(\d+%?,\d*%?,?\d*%?\)?|' +
|
||||||
'\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$')
|
'\d{0,2}\.?\d{0,2}(cm|em|ex|in|mm|pc|pt|px|%|,|\))?)$')
|
||||||
|
|
||||||
<<<<<<< TREE
|
|
||||||
mathml_elements = ['annotation', 'annotation-xml', 'maction', 'math',
|
mathml_elements = ['annotation', 'annotation-xml', 'maction', 'math',
|
||||||
'merror', 'mfenced', 'mfrac', 'mi', 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded',
|
'merror', 'mfenced', 'mfrac', 'mi', 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded',
|
||||||
'mphantom', 'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle',
|
'mphantom', 'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle',
|
||||||
'msub', 'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
|
'msub', 'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
|
||||||
=======
|
|
||||||
mathml_elements = ['annotation', 'annotation-xml', 'maction', 'math',
|
|
||||||
'merror', 'mfrac', 'mi', 'mmultiscripts', 'mn', 'mo', 'mover', 'mpadded',
|
|
||||||
'mphantom', 'mprescripts', 'mroot', 'mrow', 'mspace', 'msqrt', 'mstyle',
|
|
||||||
'msub', 'msubsup', 'msup', 'mtable', 'mtd', 'mtext', 'mtr', 'munder',
|
|
||||||
>>>>>>> MERGE-SOURCE
|
|
||||||
'munderover', 'none', 'semantics']
|
'munderover', 'none', 'semantics']
|
||||||
|
|
||||||
mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
|
mathml_attributes = ['actiontype', 'align', 'columnalign', 'columnalign',
|
||||||
<<<<<<< TREE
|
|
||||||
'columnalign', 'close', 'columnlines', 'columnspacing', 'columnspan', 'depth',
|
'columnalign', 'close', 'columnlines', 'columnspacing', 'columnspan', 'depth',
|
||||||
'display', 'displaystyle', 'encoding', 'equalcolumns', 'equalrows',
|
'display', 'displaystyle', 'encoding', 'equalcolumns', 'equalrows',
|
||||||
'fence', 'fontstyle', 'fontweight', 'frame', 'height', 'linethickness',
|
'fence', 'fontstyle', 'fontweight', 'frame', 'height', 'linethickness',
|
||||||
@ -2356,16 +2348,6 @@ class _HTMLSanitizer(_BaseHTMLProcessor):
|
|||||||
'rowlines', 'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
|
'rowlines', 'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
|
||||||
'separator', 'separators', 'stretchy', 'width', 'width', 'xlink:href',
|
'separator', 'separators', 'stretchy', 'width', 'width', 'xlink:href',
|
||||||
'xlink:show', 'xlink:type', 'xmlns', 'xmlns:xlink']
|
'xlink:show', 'xlink:type', 'xmlns', 'xmlns:xlink']
|
||||||
=======
|
|
||||||
'columnalign', 'columnlines', 'columnspacing', 'columnspan', 'depth',
|
|
||||||
'display', 'displaystyle', 'encoding', 'equalcolumns', 'equalrows',
|
|
||||||
'fence', 'fontstyle', 'fontweight', 'frame', 'height', 'linethickness',
|
|
||||||
'lspace', 'mathbackground', 'mathcolor', 'mathvariant', 'mathvariant',
|
|
||||||
'maxsize', 'minsize', 'other', 'rowalign', 'rowalign', 'rowalign',
|
|
||||||
'rowlines', 'rowspacing', 'rowspan', 'rspace', 'scriptlevel', 'selection',
|
|
||||||
'separator', 'stretchy', 'width', 'width', 'xlink:href', 'xlink:show',
|
|
||||||
'xlink:type', 'xmlns', 'xmlns:xlink']
|
|
||||||
>>>>>>> MERGE-SOURCE
|
|
||||||
|
|
||||||
# svgtiny - foreignObject + linearGradient + radialGradient + stop
|
# svgtiny - foreignObject + linearGradient + radialGradient + stop
|
||||||
svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
|
svg_elements = ['a', 'animate', 'animateColor', 'animateMotion',
|
||||||
|
Loading…
Reference in New Issue
Block a user