🔧 MAINTAIN: Add isort hook (#210)

chrisjsewell · web-flow · commit 063268b3fad8 · 2022-04-15T00:46:30.000+02:00
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -23,6 +23,11 @@ repos:
     - id: end-of-file-fixer
     - id: trailing-whitespace
 
+  - repo: https://github.com/pycqa/isort
+    rev: 5.10.1
+    hooks:
+    - id: isort
+
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
diff --git a/benchmarking/bench_core.py b/benchmarking/bench_core.py
@@ -1,4 +1,5 @@
 from pathlib import Path
+
 import pytest
 
 import markdown_it
diff --git a/benchmarking/bench_packages.py b/benchmarking/bench_packages.py
@@ -1,7 +1,8 @@
 from pathlib import Path
-import pytest
 from shutil import which
 
+import pytest
+
 
 @pytest.fixture
 def spec_text():
diff --git a/docs/conf.py b/docs/conf.py
@@ -92,6 +92,7 @@ def run_apidoc(app):
     """
     import os
     import shutil
+
     import sphinx
     from sphinx.ext import apidoc
 
diff --git a/markdown_it/cli/parse.py b/markdown_it/cli/parse.py
@@ -13,7 +13,6 @@
 from markdown_it import __version__
 from markdown_it.main import MarkdownIt
 
-
 version_str = "markdown-it-py [version {}]".format(__version__)
 
 
diff --git a/markdown_it/common/normalize_url.py b/markdown_it/common/normalize_url.py
@@ -2,13 +2,12 @@
 
 from collections.abc import Callable
 import re
-from urllib.parse import urlparse, urlunparse, quote, unquote  # noqa: F401
+from urllib.parse import quote, unquote, urlparse, urlunparse  # noqa: F401
 
 import mdurl
 
 from .. import _punycode
 
-
 RECODE_HOSTNAME_FOR = ("http:", "https:", "mailto:")
 
 
diff --git a/markdown_it/helpers/__init__.py b/markdown_it/helpers/__init__.py
@@ -1,6 +1,6 @@
 """Functions for parsing Links
 """
 __all__ = ("parseLinkLabel", "parseLinkDestination", "parseLinkTitle")
-from .parse_link_label import parseLinkLabel
 from .parse_link_destination import parseLinkDestination
+from .parse_link_label import parseLinkLabel
 from .parse_link_title import parseLinkTitle
diff --git a/markdown_it/helpers/parse_link_destination.py b/markdown_it/helpers/parse_link_destination.py
@@ -2,7 +2,7 @@
 Parse link destination
 """
 
-from ..common.utils import unescapeAll, charCodeAt
+from ..common.utils import charCodeAt, unescapeAll
 
 
 class _Result:
diff --git a/markdown_it/helpers/parse_link_title.py b/markdown_it/helpers/parse_link_title.py
@@ -1,6 +1,6 @@
 """Parse link title
 """
-from ..common.utils import unescapeAll, charCodeAt
+from ..common.utils import charCodeAt, unescapeAll
 
 
 class _Result:
diff --git a/markdown_it/main.py b/markdown_it/main.py
@@ -1,17 +1,17 @@
 from __future__ import annotations
 
-from contextlib import contextmanager
 from collections.abc import Callable, Generator, Iterable, Mapping, MutableMapping
+from contextlib import contextmanager
 from typing import Any
 
 from . import helpers, presets  # noqa F401
 from .common import normalize_url, utils  # noqa F401
-from .token import Token
-from .parser_core import ParserCore  # noqa F401
 from .parser_block import ParserBlock  # noqa F401
+from .parser_core import ParserCore  # noqa F401
 from .parser_inline import ParserInline  # noqa F401
-from .rules_core.state_core import StateCore
 from .renderer import RendererHTML, RendererProtocol
+from .rules_core.state_core import StateCore
+from .token import Token
 from .utils import OptionsDict
 
 try:
diff --git a/markdown_it/parser_block.py b/markdown_it/parser_block.py
@@ -3,10 +3,10 @@
 
 import logging
 
+from . import rules_block
 from .ruler import Ruler
-from .token import Token
 from .rules_block.state_block import StateBlock
-from . import rules_block
+from .token import Token
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/markdown_it/parser_core.py b/markdown_it/parser_core.py
@@ -6,10 +6,9 @@
 """
 from __future__ import annotations
 
-from .ruler import Ruler, RuleFunc
+from .ruler import RuleFunc, Ruler
+from .rules_core import block, inline, linkify, normalize, replace, smartquotes
 from .rules_core.state_core import StateCore
-from .rules_core import normalize, block, inline, replace, smartquotes, linkify
-
 
 _rules: list[tuple[str, RuleFunc]] = [
     ("normalize", normalize),
diff --git a/markdown_it/parser_inline.py b/markdown_it/parser_inline.py
@@ -2,10 +2,10 @@
 """
 from __future__ import annotations
 
-from .ruler import Ruler, RuleFunc
-from .token import Token
-from .rules_inline.state_inline import StateInline
 from . import rules_inline
+from .ruler import RuleFunc, Ruler
+from .rules_inline.state_inline import StateInline
+from .token import Token
 
 # Parser rules
 _rules: list[tuple[str, RuleFunc]] = [
diff --git a/markdown_it/renderer.py b/markdown_it/renderer.py
@@ -11,7 +11,7 @@ class Renderer
 import inspect
 from typing import Any, ClassVar
 
-from .common.utils import unescapeAll, escapeHtml
+from .common.utils import escapeHtml, unescapeAll
 from .token import Token
 from .utils import OptionsDict
 
diff --git a/markdown_it/ruler.py b/markdown_it/ruler.py
@@ -19,6 +19,7 @@ class Ruler
 
 from collections.abc import Callable, Iterable, MutableMapping
 from typing import TYPE_CHECKING
+
 import attr
 
 if TYPE_CHECKING:
diff --git a/markdown_it/rules_block/__init__.py b/markdown_it/rules_block/__init__.py
@@ -13,15 +13,15 @@
     "table",
 )
 
-from .state_block import StateBlock
-from .paragraph import paragraph
-from .heading import heading
-from .lheading import lheading
+from .blockquote import blockquote
 from .code import code
 from .fence import fence
+from .heading import heading
 from .hr import hr
+from .html_block import html_block
+from .lheading import lheading
 from .list import list_block
+from .paragraph import paragraph
 from .reference import reference
-from .blockquote import blockquote
-from .html_block import html_block
+from .state_block import StateBlock
 from .table import table
diff --git a/markdown_it/rules_block/blockquote.py b/markdown_it/rules_block/blockquote.py
@@ -3,8 +3,8 @@
 
 import logging
 
-from .state_block import StateBlock
 from ..common.utils import isSpace
+from .state_block import StateBlock
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/markdown_it/rules_block/code.py b/markdown_it/rules_block/code.py
@@ -1,5 +1,6 @@
 """Code block (4 spaces padded)."""
 import logging
+
 from .state_block import StateBlock
 
 LOGGER = logging.getLogger(__name__)
diff --git a/markdown_it/rules_block/heading.py b/markdown_it/rules_block/heading.py
@@ -3,8 +3,8 @@
 
 import logging
 
-from .state_block import StateBlock
 from ..common.utils import isSpace
+from .state_block import StateBlock
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/markdown_it/rules_block/hr.py b/markdown_it/rules_block/hr.py
@@ -7,7 +7,6 @@
 from ..common.utils import isSpace
 from .state_block import StateBlock
 
-
 LOGGER = logging.getLogger(__name__)
 
 
diff --git a/markdown_it/rules_block/html_block.py b/markdown_it/rules_block/html_block.py
@@ -4,9 +4,9 @@
 import logging
 import re
 
-from .state_block import StateBlock
 from ..common.html_blocks import block_names
 from ..common.html_re import HTML_OPEN_CLOSE_TAG_STR
+from .state_block import StateBlock
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/markdown_it/rules_block/list.py b/markdown_it/rules_block/list.py
@@ -1,8 +1,8 @@
 # Lists
 import logging
 
-from .state_block import StateBlock
 from ..common.utils import isSpace
+from .state_block import StateBlock
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/markdown_it/rules_block/reference.py b/markdown_it/rules_block/reference.py
@@ -1,9 +1,8 @@
 import logging
 
-from ..common.utils import isSpace, normalizeReference, charCodeAt
+from ..common.utils import charCodeAt, isSpace, normalizeReference
 from .state_block import StateBlock
 
-
 LOGGER = logging.getLogger(__name__)
 
 
diff --git a/markdown_it/rules_block/state_block.py b/markdown_it/rules_block/state_block.py
@@ -2,9 +2,9 @@
 
 from typing import TYPE_CHECKING
 
-from ..token import Token
-from ..ruler import StateBase
 from ..common.utils import isSpace
+from ..ruler import StateBase
+from ..token import Token
 
 if TYPE_CHECKING:
     from markdown_it.main import MarkdownIt
diff --git a/markdown_it/rules_block/table.py b/markdown_it/rules_block/table.py
@@ -1,9 +1,8 @@
 # GFM table, https://github.github.com/gfm/#tables-extension-
 import re
 
+from ..common.utils import charCodeAt, isSpace
 from .state_block import StateBlock
-from ..common.utils import isSpace, charCodeAt
-
 
 headerLineRe = re.compile(r"^:?-+:?$")
 enclosingPipesRe = re.compile(r"^\||\|$")
diff --git a/markdown_it/rules_core/__init__.py b/markdown_it/rules_core/__init__.py
@@ -8,10 +8,10 @@
     "linkify",
 )
 
-from .state_core import StateCore
-from .normalize import normalize
 from .block import block
 from .inline import inline
+from .linkify import linkify
+from .normalize import normalize
 from .replacements import replace
 from .smartquotes import smartquotes
-from .linkify import linkify
+from .state_core import StateCore
diff --git a/markdown_it/rules_core/linkify.py b/markdown_it/rules_core/linkify.py
@@ -1,9 +1,8 @@
 import re
 
 from ..common.utils import arrayReplaceAt
-from .state_core import StateCore
 from ..token import Token
-
+from .state_core import StateCore
 
 LINK_OPEN_RE = re.compile(r"^<a[>\s]", flags=re.IGNORECASE)
 LINK_CLOSE_RE = re.compile(r"^</a\s*>", flags=re.IGNORECASE)
diff --git a/markdown_it/rules_core/normalize.py b/markdown_it/rules_core/normalize.py
@@ -3,7 +3,6 @@
 
 from .state_core import StateCore
 
-
 # https://spec.commonmark.org/0.29/#line-ending
 NEWLINES_RE = re.compile(r"\r\n?|\n")
 NULL_RE = re.compile(r"\0")
diff --git a/markdown_it/rules_core/replacements.py b/markdown_it/rules_core/replacements.py
@@ -19,8 +19,8 @@
 import logging
 import re
 
-from .state_core import StateCore
 from ..token import Token
+from .state_core import StateCore
 
 LOGGER = logging.getLogger(__name__)
 
diff --git a/markdown_it/rules_core/smartquotes.py b/markdown_it/rules_core/smartquotes.py
@@ -5,11 +5,9 @@
 import re
 from typing import Any
 
-from .state_core import StateCore
-from ..common.utils import charCodeAt
-from ..common.utils import isWhiteSpace, isPunctChar, isMdAsciiPunct
+from ..common.utils import charCodeAt, isMdAsciiPunct, isPunctChar, isWhiteSpace
 from ..token import Token
-
+from .state_core import StateCore
 
 QUOTE_TEST_RE = re.compile(r"['\"]")
 QUOTE_RE = re.compile(r"['\"]")
diff --git a/markdown_it/rules_core/state_core.py b/markdown_it/rules_core/state_core.py
@@ -3,8 +3,8 @@
 from collections.abc import MutableMapping
 from typing import TYPE_CHECKING
 
-from ..token import Token
 from ..ruler import StateBase
+from ..token import Token
 
 if TYPE_CHECKING:
     from markdown_it import MarkdownIt
diff --git a/markdown_it/rules_inline/__init__.py b/markdown_it/rules_inline/__init__.py
@@ -14,17 +14,16 @@
     "html_inline",
     "strikethrough",
 )
-from .state_inline import StateInline
-from .text import text
-from .text_collapse import text_collapse
+from . import emphasis, strikethrough
+from .autolink import autolink
+from .backticks import backtick
 from .balance_pairs import link_pairs
+from .entity import entity
 from .escape import escape
-from .newline import newline
-from .backticks import backtick
-from . import emphasis
+from .html_inline import html_inline
 from .image import image
 from .link import link
-from .autolink import autolink
-from .entity import entity
-from .html_inline import html_inline
-from . import strikethrough
+from .newline import newline
+from .state_inline import StateInline
+from .text import text
+from .text_collapse import text_collapse
diff --git a/markdown_it/rules_inline/autolink.py b/markdown_it/rules_inline/autolink.py
@@ -1,5 +1,6 @@
 # Process autolinks '<protocol:...>'
 import re
+
 from .state_inline import StateInline
 
 EMAIL_RE = re.compile(
diff --git a/markdown_it/rules_inline/emphasis.py b/markdown_it/rules_inline/emphasis.py
@@ -1,7 +1,7 @@
 # Process *this* and _that_
 #
 
-from .state_inline import StateInline, Delimiter
+from .state_inline import Delimiter, StateInline
 
 
 def tokenize(state: StateInline, silent: bool):
diff --git a/markdown_it/rules_inline/entity.py b/markdown_it/rules_inline/entity.py
@@ -2,7 +2,7 @@
 import re
 
 from ..common.entities import entities
-from ..common.utils import isValidEntityCode, fromCodePoint
+from ..common.utils import fromCodePoint, isValidEntityCode
 from .state_inline import StateInline
 
 DIGITAL_RE = re.compile(r"^&#((?:x[a-f0-9]{1,6}|[0-9]{1,7}));", re.IGNORECASE)
diff --git a/markdown_it/rules_inline/escape.py b/markdown_it/rules_inline/escape.py
diff --git a/markdown_it/rules_inline/html_inline.py b/markdown_it/rules_inline/html_inline.py
diff --git a/markdown_it/rules_inline/image.py b/markdown_it/rules_inline/image.py
diff --git a/markdown_it/rules_inline/link.py b/markdown_it/rules_inline/link.py
diff --git a/markdown_it/rules_inline/newline.py b/markdown_it/rules_inline/newline.py
diff --git a/markdown_it/rules_inline/state_inline.py b/markdown_it/rules_inline/state_inline.py
diff --git a/markdown_it/rules_inline/strikethrough.py b/markdown_it/rules_inline/strikethrough.py
diff --git a/markdown_it/rules_inline/text.py b/markdown_it/rules_inline/text.py
diff --git a/markdown_it/tree.py b/markdown_it/tree.py
diff --git a/pyproject.toml b/pyproject.toml
diff --git a/tests/test_api/test_token.py b/tests/test_api/test_token.py
diff --git a/tests/test_port/test_misc.py b/tests/test_port/test_misc.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`	`1`	`from pathlib import Path`
	`2`	`+`
`2`	`3`	`import pytest`
`3`	`4`
`4`	`5`	`import markdown_it`