2020-03-23 11:22:56 +01:00
|
|
|
--- bleach/html5lib_shim.py
|
|
|
|
+++ bleach/html5lib_shim.py
|
2019-03-03 13:34:08 +01:00
|
|
|
@@ -11,23 +11,23 @@
|
|
|
|
|
|
|
|
import six
|
|
|
|
|
|
|
|
-from bleach._vendor.html5lib import (
|
|
|
|
+from html5lib import (
|
|
|
|
HTMLParser,
|
|
|
|
getTreeWalker,
|
|
|
|
)
|
|
|
|
-from bleach._vendor.html5lib import constants
|
|
|
|
-from bleach._vendor.html5lib.constants import (
|
|
|
|
+from html5lib import constants
|
|
|
|
+from html5lib.constants import (
|
|
|
|
namespaces,
|
|
|
|
prefixes,
|
|
|
|
)
|
|
|
|
-from bleach._vendor.html5lib.constants import _ReparseException as ReparseException
|
|
|
|
-from bleach._vendor.html5lib.filters.base import Filter
|
|
|
|
-from bleach._vendor.html5lib.filters.sanitizer import allowed_protocols
|
|
|
|
-from bleach._vendor.html5lib.filters.sanitizer import Filter as SanitizerFilter
|
|
|
|
-from bleach._vendor.html5lib._inputstream import HTMLInputStream
|
|
|
|
-from bleach._vendor.html5lib.serializer import HTMLSerializer
|
|
|
|
-from bleach._vendor.html5lib._tokenizer import HTMLTokenizer
|
|
|
|
-from bleach._vendor.html5lib._trie import Trie
|
|
|
|
+from html5lib.constants import _ReparseException as ReparseException
|
|
|
|
+from html5lib.filters.base import Filter
|
|
|
|
+from html5lib.filters.sanitizer import allowed_protocols
|
|
|
|
+from html5lib.filters.sanitizer import Filter as SanitizerFilter
|
|
|
|
+from html5lib._inputstream import HTMLInputStream
|
|
|
|
+from html5lib.serializer import HTMLSerializer
|
|
|
|
+from html5lib._tokenizer import HTMLTokenizer
|
|
|
|
+from html5lib._trie import Trie
|
|
|
|
|
|
|
|
|
|
|
|
#: Map of entity name to expanded entity
|
2020-03-23 11:22:56 +01:00
|
|
|
--- tests/test_clean.py
|
|
|
|
+++ tests/test_clean.py
|
|
|
|
@@ -7,7 +7,7 @@
|
|
|
|
from bleach import clean
|
|
|
|
from bleach.html5lib_shim import Filter
|
|
|
|
from bleach.sanitizer import Cleaner
|
|
|
|
-from bleach._vendor.html5lib.constants import rcdataElements
|
|
|
|
+from html5lib.constants import rcdataElements
|
|
|
|
|
|
|
|
def test_clean_idempotent():
|
|
|
|
"""Make sure that applying the filter twice doesn't change anything."""
|