Skip to content

Markdown compat (overtakes #3604) #3842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xordoquy merged 6 commits into from
Jan 19, 2016
Merged

Markdown compat (overtakes #3604) #3842

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
276bc3b
Remove safe_mode since it is not safe.
mjschultz Nov 5, 2015
d9d34e4
Use full python dot path to extension
mjschultz Nov 5, 2015
b2e74fb
Use markdown 2.6 extension_configs to configure extension
mjschultz Nov 5, 2015
abc6fa0
Markdown 2.1 compatible
mjschultz Nov 9, 2015
f308900
Bump the markdown optional requirement as well
mjschultz Nov 9, 2015
8ea7d6b
Merge remote-tracking branch 'origin/master' into markdown-compat
xordoquy Jan 19, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use markdown 2.6 extension_configs to configure extension
  • Loading branch information
@mjschultz
mjschultz committed Nov 5, 2015
commit b2e74fb523ff2488106a5004e1e70d2fd0592929
11 changes: 9 additions & 2 deletions rest_framework/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,8 +159,15 @@ def apply_markdown(text):
of '#' style headers to <h2>.
"""

extensions = ['markdown.extensions.headerid(level=2)']
md = markdown.Markdown(extensions=extensions)
extensions = ['markdown.extensions.headerid']
extension_configs = {
'markdown.extensions.headerid': {
'level': '2'
}
}
md = markdown.Markdown(
extensions=extensions, extension_configs=extension_configs
)
return md.convert(text)
except ImportError:
apply_markdown = None
Expand Down