From 31f9d51bf395e67996d0646e87f2e3771bec3cb6 Mon Sep 17 00:00:00 2001
From: Manuel Barkhau <mbarkhau@gmail.com>
Date: Sun, 6 Sep 2020 21:44:23 +0000
Subject: [PATCH] fmt lint etc. pp.

---
 src/pycalver/__main__.py |  5 +++--
 src/pycalver/rewrite.py  | 11 ++++++++---
 src/pycalver2/cli.py     |  1 +
 src/pycalver2/rewrite.py | 22 +++++++++++++++-------
 test/test_cli.py         |  2 +-
 test/test_patterns.py    |  2 +-
 test/test_rewrite.py     |  5 +++--
 7 files changed, 32 insertions(+), 16 deletions(-)

diff --git a/src/pycalver/__main__.py b/src/pycalver/__main__.py
index 06b41cd..7149fc2 100755
--- a/src/pycalver/__main__.py
+++ b/src/pycalver/__main__.py
@@ -15,14 +15,15 @@ import logging
 import subprocess as sp
 
 import click
+import pycalver2.version as v2version
 
 import pycalver.cli as v1cli
-import pycalver2.cli as v2cli
 import pycalver.version as v1version
-import pycalver2.version as v2version
 from pycalver import vcs
 from pycalver import config
 
+# import pycalver2.cli as v2cli
+
 _VERBOSE = 0
 
 
diff --git a/src/pycalver/rewrite.py b/src/pycalver/rewrite.py
index c06fa7d..ddc5146 100644
--- a/src/pycalver/rewrite.py
+++ b/src/pycalver/rewrite.py
@@ -77,7 +77,9 @@ def iter_file_paths(
 
 
 def rewrite_lines(
-    pattern_strs: typ.List[str], new_vinfo: version.VersionInfo, old_lines: typ.List[str]
+    pattern_strs: typ.List[str],
+    new_vinfo   : version.VersionInfo,
+    old_lines   : typ.List[str],
 ) -> typ.List[str]:
     """Replace occurances of pattern_strs in old_lines with new_vinfo.
 
@@ -112,7 +114,9 @@ def rewrite_lines(
 
 
 def rfd_from_content(
-    pattern_strs: typ.List[str], new_vinfo: version.VersionInfo, content: str
+    pattern_strs: typ.List[str],
+    new_vinfo   : version.VersionInfo,
+    content     : str,
 ) -> RewrittenFileData:
     r"""Rewrite pattern occurrences with version string.
 
@@ -137,7 +141,8 @@ def rfd_from_content(
 
 
 def iter_rewritten(
-    file_patterns: config.PatternsByGlob, new_vinfo: version.VersionInfo
+    file_patterns: config.PatternsByGlob,
+    new_vinfo    : version.VersionInfo,
 ) -> typ.Iterable[RewrittenFileData]:
     r'''Iterate over files with version string replaced.
 
diff --git a/src/pycalver2/cli.py b/src/pycalver2/cli.py
index 107d4b8..23d4913 100644
--- a/src/pycalver2/cli.py
+++ b/src/pycalver2/cli.py
@@ -14,6 +14,7 @@ import logging
 
 import pycalver2.rewrite as v2rewrite
 import pycalver2.version as v2version
+
 from pycalver import config
 
 logger = logging.getLogger("pycalver2.cli")
diff --git a/src/pycalver2/rewrite.py b/src/pycalver2/rewrite.py
index 7595099..c5592d7 100644
--- a/src/pycalver2/rewrite.py
+++ b/src/pycalver2/rewrite.py
@@ -9,17 +9,20 @@ import io
 import typing as typ
 import logging
 
+from pycalver2 import version
+from pycalver2 import patterns
+
 from pycalver import parse
 from pycalver import config
 from pycalver import rewrite as v1rewrite
-from pycalver2 import version
-from pycalver2 import patterns
 
 logger = logging.getLogger("pycalver2.rewrite")
 
 
 def rewrite_lines(
-    pattern_strs: typ.List[str], new_vinfo: version.VersionInfo, old_lines: typ.List[str]
+    pattern_strs: typ.List[str],
+    new_vinfo   : version.VersionInfo,
+    old_lines   : typ.List[str],
 ) -> typ.List[str]:
     """TODO reenable doctest"""
     pass
@@ -38,8 +41,10 @@ def rewrite_lines(
     new_lines      = old_lines[:]
     found_patterns = set()
 
-    re_patterns = [patterns.compile_pattern(p) for p in pattern_strs]
-    for match in parse.iter_matches(old_lines, re_patterns):
+    # re_patterns = [patterns.compile_pattern(p) for p in pattern_strs]
+    # matches = parse.iter_matches(old_lines, re_patterns)
+    matches = parse.iter_matches(old_lines, pattern_strs)
+    for match in matches:
         found_patterns.add(match.pattern)
         replacement = version.format_version(new_vinfo, match.pattern)
         span_l, span_r = match.span
@@ -58,7 +63,9 @@ def rewrite_lines(
 
 
 def rfd_from_content(
-    pattern_strs: typ.List[str], new_vinfo: version.VersionInfo, content: str
+    pattern_strs: typ.List[str],
+    new_vinfo   : version.VersionInfo,
+    content     : str,
 ) -> v1rewrite.RewrittenFileData:
     """TODO reenable doctest"""
     pass
@@ -86,7 +93,8 @@ def rfd_from_content(
 
 
 def iter_rewritten(
-    file_patterns: config.PatternsByGlob, new_vinfo: version.VersionInfo
+    file_patterns: config.PatternsByGlob,
+    new_vinfo    : version.VersionInfo,
 ) -> typ.Iterable[v1rewrite.RewrittenFileData]:
     """TODO reenable doctest"""
     pass
diff --git a/test/test_cli.py b/test/test_cli.py
index 38355a2..fcac244 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -8,10 +8,10 @@ import subprocess as sp
 
 import pytest
 import pathlib2 as pl
+import pycalver2.patterns as patterns
 from click.testing import CliRunner
 
 import pycalver.config as config
-import pycalver2.patterns as patterns
 from pycalver.__main__ import cli
 
 SETUP_CFG_FIXTURE = """
diff --git a/test/test_patterns.py b/test/test_patterns.py
index 61d8d48..89c44b2 100644
--- a/test/test_patterns.py
+++ b/test/test_patterns.py
@@ -1,9 +1,9 @@
 import re
 
 import pytest
+import pycalver2.patterns as v2patterns
 
 import pycalver.patterns as v1patterns
-import pycalver2.patterns as v2patterns
 
 # TODO (mb 2020-09-06): test for v2patterns
 
diff --git a/test/test_rewrite.py b/test/test_rewrite.py
index 1eb0dd7..7d2693c 100644
--- a/test/test_rewrite.py
+++ b/test/test_rewrite.py
@@ -3,11 +3,12 @@
 import copy
 from test import util
 
+from pycalver2 import rewrite as v2rewrite
+from pycalver2 import version as v2version
+
 from pycalver import config
 from pycalver import rewrite as v1rewrite
 from pycalver import version as v1version
-from pycalver2 import rewrite as v2rewrite
-from pycalver2 import version as v2version
 
 REWRITE_FIXTURE = """
 # SPDX-License-Identifier: MIT