Commitc2e9470

committed

Merge pull request#3842 from linovia/markdown-compat

Markdown compat (overtakes#3604)

2 parents50749c4 +8ea7d6b commitc2e9470Copy full SHA for c2e9470

File tree

+14

-5

lines changed

+14

-5

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`	`1`	`# Optional packages which may be used with REST framework.`
`2`		`-markdown==2.5.2`
	`2`	`+markdown==2.6.4`
`3`	`3`	`django-guardian==1.3.2`
`4`	`4`	`django-filter==0.10.0`

Lines changed: 13 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -153,16 +153,25 @@ def __init__(self, args, *kwargs):`
`153`	`153`	`try:`
`154`	`154`	`importmarkdown`
`155`	`155`
	`156`	`+ifmarkdown.version<='2.2':`
	`157`	`+HEADERID_EXT_PATH='headerid'`
	`158`	`+else:`
	`159`	`+HEADERID_EXT_PATH='markdown.extensions.headerid'`
`156`	`160`
`157`	`161`	`defapply_markdown(text):`
`158`	`162`	`"""`
`159`	`163`	Simple wrapper around :func:`markdown.markdown` to set the base level
`160`	`164`	`of '#' style headers to <h2>.`
`161`	`165`	`"""`
`162`		`-`
`163`		`-extensions= ['headerid(level=2)']`
`164`		`-safe_mode=False`
`165`		`-md=markdown.Markdown(extensions=extensions,safe_mode=safe_mode)`
	`166`	`+extensions= [HEADERID_EXT_PATH]`
	`167`	`+extension_configs= {`
	`168`	`+HEADERID_EXT_PATH: {`
	`169`	`+'level':'2'`
	`170`	`+ }`
	`171`	`+ }`
	`172`	`+md=markdown.Markdown(`
	`173`	`+extensions=extensions,extension_configs=extension_configs`
	`174`	`+ )`
`166`	`175`	`returnmd.convert(text)`
`167`	`176`	`exceptImportError:`
`168`	`177`	`apply_markdown=None`

Comments

(0)