upgrade mistune to 2.x

Author: asottile

index.mako

@@ -844,7 +844,7 @@ _new in 2.8.0_: `pre-commit` now exits with more specific codes:
 - `3`: an unexpected error
 - `130`: the process was interrupted by `^C`
 
-## pre-commit autoupdate [options] [](#pre-commit-autoupdate)
+## pre-commit autoupdate [options] #pre-commit-autoupdate
 
 Auto-update pre-commit config to the latest repos' versions.
 
@@ -901,13 +901,13 @@ $ grep rev: .pre-commit-config.yaml
     rev: 34a269fd7650d264e4de7603157c10d0a9bb8211  # frozen: v1.25.2
 ```
 
-## pre-commit clean [options] [](#pre-commit-clean)
+## pre-commit clean [options] #pre-commit-clean
 
 Clean out cached pre-commit files.
 
 Options: (no additional options)
 
-## pre-commit gc [options] [](#pre-commit-gc)
+## pre-commit gc [options] #pre-commit-gc
 
 _new in 1.14.0_
 
@@ -919,7 +919,7 @@ the cache directory.
 
 Options: (no additional options)
 
-## pre-commit init-templatedir DIRECTORY [options] [](#pre-commit-init-templatedir)
+## pre-commit init-templatedir DIRECTORY [options] #pre-commit-init-templatedir
 
 _new in 1.18.0_
 
@@ -942,7 +942,7 @@ pre-commit init-templatedir ~/.git-template
 Now whenever a repository is cloned or created, it will have the hooks set up
 already!
 
-## pre-commit install [options] [](#pre-commit-install)
+## pre-commit install [options] #pre-commit-install
 
 Install the pre-commit script.
 
@@ -967,7 +967,7 @@ Some example useful invocations:
    existing git hook scripts with pre-commit, and also installs hook
    environments.
 
-## pre-commit install-hooks [options] [](#pre-commit-install-hooks)
+## pre-commit install-hooks [options] #pre-commit-install-hooks
 
 Install all missing environments for the available hooks. Unless this command or
 `install --install-hooks` is executed, each hook's environment is created the
@@ -981,15 +981,15 @@ the hook environments in one command, use `pre-commit install --install-hooks`.
 
 Options: (no additional options)
 
-## pre-commit migrate-config [options] [](#pre-commit-migrate-config)
+## pre-commit migrate-config [options] #pre-commit-migrate-config
 
 _new in 1.0.0_
 
 Migrate list configuration to the new map configuration format.
 
 Options: (no additional options)
 
-## pre-commit run [hook-id] [options] [](#pre-commit-run)
+## pre-commit run [hook-id] [options] #pre-commit-run
 
 Run hooks.
 
@@ -1019,13 +1019,13 @@ Some example useful invocations:
   have changed between `HEAD^^^` and `HEAD`.  This form is useful when
   leveraged in a pre-receive hook.
 
-## pre-commit sample-config [options] [](#pre-commit-sample-config)
+## pre-commit sample-config [options] #pre-commit-sample-config
 
 Produce a sample `.pre-commit-config.yaml`.
 
 Options: (no additional options)
 
-## pre-commit try-repo REPO [options] [](#pre-commit-try-repo)
+## pre-commit try-repo REPO [options] #pre-commit-try-repo
 
 _new in 1.3.0_
 
@@ -1053,7 +1053,7 @@ Some example useful invocations:
 - See [`pre-commit run`](#pre-commit-run) for more useful `run` invocations
   which are also supported by `pre-commit try-repo`.
 
-## pre-commit uninstall [options] [](#pre-commit-uninstall)
+## pre-commit uninstall [options] #pre-commit-uninstall
 
 Uninstall the pre-commit script.
 

requirements-dev.txt

@@ -1,8 +1,6 @@
 mako
 libsass
-markdown-code-blocks
+markdown-code-blocks>=3.0.0
 markdown-to-presentation>=0.0.12
-# remove once merged and release
-git+https://github.com/lepture/mistune@449c2b5
 pre-commit>=1.21.0
 pygments-pre-commit>=1.4.0

template_lib.py

@@ -9,7 +9,7 @@
 import markupsafe
 
 
-ID_RE = re.compile(r'\[\]\(#([a-z0-9-]+)\)')
+ID_RE = re.compile(r' #([a-z0-9-]+)$')
 SPECIAL_CHARS_RE = re.compile('[^a-z0-9 _-]')
 
 
@@ -94,16 +94,17 @@ def link(
     ) -> str:
         if link.startswith(SELF_LINK_PREFIX):
             a_id = link[len(SELF_LINK_PREFIX):]
-            return f'<a id="{a_id}" href="#{a_id}">{title}</a>'
+            return f'<a id="{a_id}" href="#{a_id}">{text}</a>'
         else:
             return super().link(link, text, title)
 
-    def header(self, text: str, level: int, raw: str) -> str:
-        match = ID_RE.search(raw)
+    def heading(self, text: str, level: int) -> str:
+        match = ID_RE.search(text)
+        text = ID_RE.sub('', text)
         if match:
-            h_id = match.group(1)
+            h_id = match[1]
         else:
-            h_id = SPECIAL_CHARS_RE.sub('', raw.lower()).replace(' ', '-')
+            h_id = SPECIAL_CHARS_RE.sub('', text.lower()).replace(' ', '-')
         return (
             f'<h{level} id="{h_id}">'
             f'    {text} <small><a href="#{h_id}">¶</a></small>'
@@ -117,18 +118,18 @@ def codespan(self, text: str) -> str:
         else:
             return super().codespan(text)
 
-    def block_code(self, code: str, lang: Optional[str]) -> str:
+    def block_code(self, code: str, info: Optional[str] = None) -> str:
         copyable = False
-        if lang is not None:
+        if info is not None:
             copyable_s = '#copyable'
-            copyable = lang.endswith(copyable_s)
-            lang, _, _ = lang.partition(copyable_s)
-        if lang == 'table':
+            copyable = info.endswith(copyable_s)
+            info, _, _ = info.partition(copyable_s)
+        if info == 'table':
             ret = _render_table(code)
-        elif lang == 'cmd':
+        elif info == 'cmd':
             ret = _render_cmd(code)
         else:
-            ret = super().block_code(code, lang)
+            ret = super().block_code(code, info)
         if copyable:
             return f'<div class="copyable">{ret}</div>'
         else: