veniasilente/veekun_pokedex
1
0
Fork 0
mirror of https://github.com/veekun/pokedex.git synced 2024-08-20 18:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Fix some Markdown warnings

Browse source 
Fixes the following warnings when run with Markdown 2.6.11:

DeprecationWarning: "safe_mode" is deprecated in Python-Markdown. Use an HTML sanitizer (like Bleach https://bleach.readthedocs.io/) if you are parsing untrusted markdown text. See the 2.6 release notes for more info
DeprecationWarning: Using short names for Markdown's builtin extensions is deprecated. Use the full path to the extension with Python's dot notation (eg: "markdown.extensions.extra" instead of "extra"). The current behavior will raise an error in version 2.7. See the Release Notes for Python-Markdown version 2.6 for more info.

Also get rid of some compatability code for Markdown 2.0, which we no longer support.

Updates #257
This commit is contained in:
Andrew Ekstedt 2021-03-19 21:45:14 -07:00
parent 84f88bacc1
commit 68ee98ffdd
1 changed files with 14 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
pokedex/db/markdown.py
View file

@ -16,12 +16,8 @@ import re
import markdown import markdown
import six import six
from sqlalchemy.orm.session import object_session from sqlalchemy.orm.session import object_session
try:
# Markdown 2.1+
from markdown.util import etree, AtomicString from markdown.util import etree, AtomicString
except ImportError:
# Old Markdown
from markdown import etree, AtomicString
@six.python_2_unicode_compatible @six.python_2_unicode_compatible
class MarkdownString(object): class MarkdownString(object):
@ -66,8 +62,7 @@ class MarkdownString(object):
extension = self.session.markdown_extension extension = self.session.markdown_extension
md = markdown.Markdown( md = markdown.Markdown(
extensions=['extra', extension], extensions=['markdown.extensions.extra', EscapeHtml(), extension],
safe_mode='escape',
output_format='xhtml1', output_format='xhtml1',
) )
@ -228,6 +223,17 @@ class PokedexLinkPattern(markdown.inlinepatterns.Pattern):
el.text = AtomicString(label or name) el.text = AtomicString(label or name)
return el return el
class EscapeHtml(markdown.Extension):
u"""Markdown extension which escapes raw html elements.
This is the recommended replacement for safe_mode='escape',
which was deprecated in Markdown 2.5.
See https://python-markdown.github.io/change_log/release-2.5/
"""
def extendMarkdown(self, md, md_globals):
del md.preprocessors['html_block']
del md.inlinePatterns['html']
class PokedexLinkExtension(markdown.Extension): class PokedexLinkExtension(markdown.Extension):
u"""Markdown extension that translates the syntax used in effect text: u"""Markdown extension that translates the syntax used in effect text: