From: 
Subject: Debian changes

The Debian packaging of python-m2r2 is maintained in git, using a workflow
similar to the one described in dgit-maint-merge(7).
The Debian delta is represented by this one combined patch; there isn't a
patch queue that can be represented as a quilt series.

A detailed breakdown of the changes is available from their canonical
representation -- git commits in the packaging repository.
For example, to see the changes made by the Debian maintainer in the first
upload of upstream version 1.2.3, you could use:

    % git clone https://git.dgit.debian.org/python-m2r2
    % cd python-m2r2
    % git log --oneline 1.2.3..debian/1.2.3-1 -- . ':!debian'

(If you have dgit, use `dgit clone python-m2r2`, rather than plain `git clone`.)

We don't use debian/source/options single-debian-patch because it has bugs.
Therefore, NMUs etc. may nevertheless have made additional patches.

---

diff --git a/m2r2.py b/m2r2.py
index 0168b37..3df20c8 100644
--- a/m2r2.py
+++ b/m2r2.py
@@ -11,7 +11,7 @@ import re
 import sys
 from argparse import ArgumentParser, Namespace
 
-import mistune
+import mistune0
 from docutils import io, statemachine, utils
 from docutils.parsers import rst
 from docutils.utils import column_width
@@ -86,7 +86,7 @@ def parse_options():
     parser.parse_known_args(namespace=options)
 
 
-class RestBlockGrammar(mistune.BlockGrammar):  # pylint: disable=too-few-public-methods
+class RestBlockGrammar(mistune0.BlockGrammar):  # pylint: disable=too-few-public-methods
     directive = re.compile(
         r"^( *\.\..*?)\n(?=\S)",
         re.DOTALL | re.MULTILINE,
@@ -101,13 +101,13 @@ class RestBlockGrammar(mistune.BlockGrammar):  # pylint: disable=too-few-public-
     )
 
 
-class RestBlockLexer(mistune.BlockLexer):
+class RestBlockLexer(mistune0.BlockLexer):
     grammar_class = RestBlockGrammar
     default_rules = [
         "directive",
         "oneline_directive",
         "rest_code_block",
-    ] + mistune.BlockLexer.default_rules
+    ] + mistune0.BlockLexer.default_rules
 
     def parse_directive(self, m):
         self.tokens.append({"type": "directive", "text": m.group(1)})
@@ -120,7 +120,7 @@ class RestBlockLexer(mistune.BlockLexer):
         self.tokens.append({"type": "rest_code_block"})
 
 
-class RestInlineGrammar(mistune.InlineGrammar):
+class RestInlineGrammar(mistune0.InlineGrammar):
     image_link = re.compile(
         r"\[!\[(?P<alt>.*?)\]\((?P<url>.*?)\).*?\]\((?P<target>.*?)\)"
     )
@@ -146,14 +146,14 @@ class RestInlineGrammar(mistune.InlineGrammar):
         self.emphasis = re.compile(r"^\*(?P<text>(?:\*\*|[^\*])+?)\*(?!\*)")  # *word*
 
 
-class RestInlineLexer(mistune.InlineLexer):
+class RestInlineLexer(mistune0.InlineLexer):
     grammar_class = RestInlineGrammar
     default_rules = [
         "image_link",
         "rest_role",
         "rest_link",
         "eol_literal_marker",
-    ] + mistune.InlineLexer.default_rules
+    ] + mistune0.InlineLexer.default_rules
 
     def __init__(self, *args, **kwargs):
         no_underscore_emphasis = kwargs.pop("no_underscore_emphasis", False)
@@ -204,7 +204,7 @@ class RestInlineLexer(mistune.InlineLexer):
         return self.renderer.eol_literal_marker(marker)
 
 
-class RestRenderer(mistune.Renderer):  # pylint: disable=too-many-public-methods
+class RestRenderer(mistune0.Renderer):  # pylint: disable=too-many-public-methods
     _include_raw_html = False
     list_indent_re = re.compile(r"^(\s*(#\.|\*)\s)")
     indent = " " * 3
@@ -520,7 +520,7 @@ class RestRenderer(mistune.Renderer):  # pylint: disable=too-many-public-methods
         return "\n\n"
 
 
-class M2R(mistune.Markdown):
+class M2R(mistune0.Markdown):
     def __init__(
         self, renderer=None, inline=RestInlineLexer, block=RestBlockLexer, **kwargs
     ):
diff --git a/tests/test_cli.py b/tests/test_cli.py
index 8bcec1c..0fc4944 100644
--- a/tests/test_cli.py
+++ b/tests/test_cli.py
@@ -7,7 +7,6 @@ from os import path
 from copy import copy
 from unittest import TestCase
 import subprocess
-import six
 from m2r2 import parse_from_file, main, options
 
 
@@ -51,7 +50,7 @@ class TestConvert(TestCase):
         self.assertIn("underscore-emphasis", message)
         self.assertIn("anonymous-references", message)
         self.assertIn("inline-math", message)
-        six.assertRegex(self, message, r"option(s|al arguments):")
+        self.assertRegex(message, r"option(s|al arguments):")
 
     def test_parse_file(self):
         output = parse_from_file(test_md)
