docstrfmt 2.0.0__tar.gz → 2.0.2__tar.gz

{docstrfmt-2.0.0 → docstrfmt-2.0.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: docstrfmt
-Version: 2.0.0
+Version: 2.0.2
 Summary: docstrfmt: A formatter for Sphinx flavored reStructuredText.
 Keywords: black,docutils,autoformatter,formatter,lint,restructuredtext,rst,sphinx
 Author-email: Joel Payne <lilspazjoekp@gmail.com>

{docstrfmt-2.0.0 → docstrfmt-2.0.2}/docstrfmt/__init__.py

@@ -9,4 +9,4 @@ from .const import (
 )
 from .docstrfmt import Manager
 
-__version__ = "2.0.0"
+__version__ = "2.0.2"

{docstrfmt-2.0.0 → docstrfmt-2.0.2}/docstrfmt/docstrfmt.py

@@ -1075,20 +1075,10 @@ class Formatters:
                 f"Invalid doctest block: {e}",
             ) from None
         doctest_blocks = []
-        current_block = ""
-        while parsed:
-            example = parsed.pop(0)
-            if example.want:
-                current_block += example.source.strip()
-                formatted = CodeFormatters(current_block, context).python()
-                doctest_blocks.append((formatted, example.want.strip()))
-                current_block = ""
-            else:  # pragma: no cover
-                current_block += example.source.strip() + "\n"
-        if current_block:
-            # If there's any remaining code, format it as well.
-            formatted = CodeFormatters(current_block, context).python()
-            doctest_blocks.append((formatted, ""))
+        for example in parsed:
+            formatted = CodeFormatters(example.source.strip(), context).python()
+            doctest_blocks.append((formatted, example.want.strip()))
+
         if not doctest_blocks:
             raise InvalidRstError(
                 context.current_file,
@@ -1097,11 +1087,10 @@ class Formatters:
                 "Empty doctest block.",
             )
         for formatted, want in doctest_blocks:
-            for line in formatted.splitlines():
-                if line.startswith(" "):
-                    yield f"... {line}"
-                elif line:
-                    yield f">>> {line}"
+            first_line, *other_lines = formatted.splitlines()
+            yield f">>> {first_line}"
+            for line in other_lines:
+                yield f"... {line}" if line else "..."
             if want:
                 yield from want.splitlines()
 

{docstrfmt-2.0.0 → docstrfmt-2.0.2}/docstrfmt/main.py

@@ -387,7 +387,7 @@ def _validate_adornments(
     :raises click.BadParameter: If adornments are not unique.
 
     """
-    actual_value = value or context.params["section_adornments"]
+    actual_value = context.params.pop("section_adornments", value)
 
     if len(actual_value) != len(set(actual_value)):
         msg = "Section adornments must be unique"
@@ -395,11 +395,13 @@ def _validate_adornments(
 
     if "|" in actual_value:
         with_overline, without_overline = actual_value.split("|", 1)
-        return list(zip(with_overline, itertools.repeat(True))) + list(
+        adornments = list(zip(with_overline, itertools.repeat(True))) + list(
             zip(without_overline, itertools.repeat(False))
         )
+    else:
+        adornments = list(zip(actual_value, itertools.repeat(False)))
 
-    return list(zip(actual_value, itertools.repeat(False)))
+    return adornments
 
 
 async def _run_formatter(