plugin text syntaxes: disable raw HTML parsing in mardown by default
This commit is contained in:
parent
598f4e465e
commit
fbb5442ff8
1 changed files with 13 additions and 5 deletions
|
|
@ -17,12 +17,13 @@
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
# You should have received a copy of the GNU Affero General Public License
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
import re
|
||||||
|
from cgi import escape
|
||||||
|
from functools import partial
|
||||||
from sat.core.i18n import _, D_
|
from sat.core.i18n import _, D_
|
||||||
from sat.core.constants import Const as C
|
from sat.core.constants import Const as C
|
||||||
from sat.core.log import getLogger
|
from sat.core.log import getLogger
|
||||||
|
|
||||||
log = getLogger(__name__)
|
|
||||||
|
|
||||||
from twisted.internet import defer
|
from twisted.internet import defer
|
||||||
from twisted.internet.threads import deferToThread
|
from twisted.internet.threads import deferToThread
|
||||||
from sat.core import exceptions
|
from sat.core import exceptions
|
||||||
|
|
@ -36,9 +37,8 @@ except ImportError:
|
||||||
raise exceptions.MissingModule(
|
raise exceptions.MissingModule(
|
||||||
u"Missing module lxml, please download/install it from http://lxml.de/"
|
u"Missing module lxml, please download/install it from http://lxml.de/"
|
||||||
)
|
)
|
||||||
from cgi import escape
|
|
||||||
import re
|
|
||||||
|
|
||||||
|
log = getLogger(__name__)
|
||||||
|
|
||||||
CATEGORY = D_("Composition")
|
CATEGORY = D_("Composition")
|
||||||
NAME = "Syntax"
|
NAME = "Syntax"
|
||||||
|
|
@ -199,6 +199,14 @@ class TextSyntaxes(object):
|
||||||
)
|
)
|
||||||
try:
|
try:
|
||||||
import markdown, html2text
|
import markdown, html2text
|
||||||
|
from markdown.extensions import Extension
|
||||||
|
|
||||||
|
# XXX: we disable raw HTML parsing by default, to avoid parsing error
|
||||||
|
# when the user is not aware of markdown and HTML
|
||||||
|
class EscapeHTML(Extension):
|
||||||
|
def extendMarkdown(self, md):
|
||||||
|
md.preprocessors.deregister('html_block')
|
||||||
|
md.inlinePatterns.deregister('html')
|
||||||
|
|
||||||
def _html2text(html, baseurl=""):
|
def _html2text(html, baseurl=""):
|
||||||
h = html2text.HTML2Text(baseurl=baseurl)
|
h = html2text.HTML2Text(baseurl=baseurl)
|
||||||
|
|
@ -207,7 +215,7 @@ class TextSyntaxes(object):
|
||||||
|
|
||||||
self.addSyntax(
|
self.addSyntax(
|
||||||
self.SYNTAX_MARKDOWN,
|
self.SYNTAX_MARKDOWN,
|
||||||
markdown.markdown,
|
partial(markdown.markdown, extensions=[EscapeHTML()]),
|
||||||
_html2text,
|
_html2text,
|
||||||
[TextSyntaxes.OPT_DEFAULT],
|
[TextSyntaxes.OPT_DEFAULT],
|
||||||
)
|
)
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue