rfctr: resolve some import cycles

Author: scanny

src/docx/blkcntnr.py

@@ -18,7 +18,7 @@
 from docx.text.paragraph import Paragraph
 
 if TYPE_CHECKING:
-    from docx import types as t
+    import docx.types as t
     from docx.oxml.document import CT_Body
     from docx.oxml.section import CT_HdrFtr
     from docx.oxml.table import CT_Tc
@@ -41,9 +41,7 @@ def __init__(self, element: BlockItemElement, parent: t.ProvidesStoryPart):
         super(BlockItemContainer, self).__init__(parent)
         self._element = element
 
-    def add_paragraph(
-        self, text: str = "", style: str | ParagraphStyle | None = None
-    ) -> Paragraph:
+    def add_paragraph(self, text: str = "", style: str | ParagraphStyle | None = None) -> Paragraph:
         """Return paragraph newly added to the end of the content in this container.
 
         The paragraph has `text` in a single run if present, and is given paragraph
@@ -77,11 +75,7 @@ def iter_inner_content(self) -> Iterator[Paragraph | Table]:
         from docx.table import Table
 
         for element in self._element.inner_content_elements:
-            yield (
-                Paragraph(element, self)
-                if isinstance(element, CT_P)
-                else Table(element, self)
-            )
+            yield (Paragraph(element, self) if isinstance(element, CT_P) else Table(element, self))
 
     @property
     def paragraphs(self):

src/docx/document.py

@@ -14,7 +14,7 @@
 from docx.shared import ElementProxy, Emu
 
 if TYPE_CHECKING:
-    from docx import types as t
+    import docx.types as t
     from docx.oxml.document import CT_Body, CT_Document
     from docx.parts.document import DocumentPart
     from docx.settings import Settings
@@ -56,9 +56,7 @@ def add_page_break(self):
         paragraph.add_run().add_break(WD_BREAK.PAGE)
         return paragraph
 
-    def add_paragraph(
-        self, text: str = "", style: str | ParagraphStyle | None = None
-    ) -> Paragraph:
+    def add_paragraph(self, text: str = "", style: str | ParagraphStyle | None = None) -> Paragraph:
         """Return paragraph newly added to the end of the document.
 
         The paragraph is populated with `text` and having paragraph style `style`.

src/docx/drawing/__init__.py

@@ -2,10 +2,14 @@
 
 from __future__ import annotations
 
-from docx import types as t
+from typing import TYPE_CHECKING
+
 from docx.oxml.drawing import CT_Drawing
 from docx.shared import Parented
 
+if TYPE_CHECKING:
+    import docx.types as t
+
 
 class Drawing(Parented):
     """Container for a DrawingML object."""

src/docx/shared.py

@@ -16,7 +16,7 @@
 )
 
 if TYPE_CHECKING:
-    from docx import types as t
+    import docx.types as t
     from docx.opc.part import XmlPart
     from docx.oxml.xmlchemy import BaseOxmlElement
     from docx.parts.story import StoryPart
@@ -284,9 +284,7 @@ class ElementProxy:
     common type of class in python-docx other than custom element (oxml) classes.
     """
 
-    def __init__(
-        self, element: BaseOxmlElement, parent: t.ProvidesXmlPart | None = None
-    ):
+    def __init__(self, element: BaseOxmlElement, parent: t.ProvidesXmlPart | None = None):
         self._element = element
         self._parent = parent
 

src/docx/table.py

@@ -6,7 +6,6 @@
 
 from typing_extensions import TypeAlias
 
-from docx import types as t
 from docx.blkcntnr import BlockItemContainer
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.table import WD_CELL_VERTICAL_ALIGNMENT
@@ -15,6 +14,7 @@
 from docx.shared import Inches, Parented, StoryChild, lazyproperty
 
 if TYPE_CHECKING:
+    import docx.types as t
     from docx.enum.table import WD_ROW_HEIGHT_RULE, WD_TABLE_ALIGNMENT, WD_TABLE_DIRECTION
     from docx.oxml.table import CT_Row, CT_Tbl, CT_TblPr, CT_Tc
     from docx.shared import Length
@@ -193,7 +193,7 @@ class _Cell(BlockItemContainer):
     """Table cell."""
 
     def __init__(self, tc: CT_Tc, parent: TableParent):
-        super(_Cell, self).__init__(tc, cast(t.ProvidesStoryPart, parent))
+        super(_Cell, self).__init__(tc, cast("t.ProvidesStoryPart", parent))
         self._parent = parent
         self._tc = self._element = tc
 

src/docx/text/hyperlink.py

@@ -7,13 +7,15 @@
 
 from __future__ import annotations
 
-from typing import List
+from typing import TYPE_CHECKING
 
-from docx import types as t
-from docx.oxml.text.hyperlink import CT_Hyperlink
 from docx.shared import Parented
 from docx.text.run import Run
 
+if TYPE_CHECKING:
+    import docx.types as t
+    from docx.oxml.text.hyperlink import CT_Hyperlink
+
 
 class Hyperlink(Parented):
     """Proxy object wrapping a `<w:hyperlink>` element.
@@ -78,7 +80,7 @@ def fragment(self) -> str:
         return self._hyperlink.anchor or ""
 
     @property
-    def runs(self) -> List[Run]:
+    def runs(self) -> list[Run]:
         """List of |Run| instances in this hyperlink.
 
         Together these define the visible text of the hyperlink. The text of a hyperlink

src/docx/text/pagebreak.py

@@ -4,11 +4,11 @@
 
 from typing import TYPE_CHECKING
 
-from docx import types as t
 from docx.oxml.text.pagebreak import CT_LastRenderedPageBreak
 from docx.shared import Parented
 
 if TYPE_CHECKING:
+    import docx.types as t
     from docx.text.paragraph import Paragraph
 
 

src/docx/text/paragraph.py

@@ -4,7 +4,6 @@
 
 from typing import TYPE_CHECKING, Iterator, List, cast
 
-from docx import types as t
 from docx.enum.style import WD_STYLE_TYPE
 from docx.oxml.text.run import CT_R
 from docx.shared import StoryChild
@@ -15,6 +14,7 @@
 from docx.text.run import Run
 
 if TYPE_CHECKING:
+    import docx.types as t
     from docx.enum.text import WD_PARAGRAPH_ALIGNMENT
     from docx.oxml.text.paragraph import CT_P
     from docx.styles.style import CharacterStyle

src/docx/text/run.py

@@ -4,7 +4,6 @@
 
 from typing import IO, TYPE_CHECKING, Iterator, cast
 
-from docx import types as t
 from docx.drawing import Drawing
 from docx.enum.style import WD_STYLE_TYPE
 from docx.enum.text import WD_BREAK
@@ -17,6 +16,7 @@
 from docx.text.pagebreak import RenderedPageBreak
 
 if TYPE_CHECKING:
+    import docx.types as t
     from docx.enum.text import WD_UNDERLINE
     from docx.oxml.text.run import CT_R, CT_Text
     from docx.shared import Length
@@ -170,9 +170,7 @@ def iter_inner_content(self) -> Iterator[str | Drawing | RenderedPageBreak]:
                 yield item
             elif isinstance(item, CT_LastRenderedPageBreak):
                 yield RenderedPageBreak(item, self)
-            elif isinstance(  # pyright: ignore[reportUnnecessaryIsInstance]
-                item, CT_Drawing
-            ):
+            elif isinstance(item, CT_Drawing):  # pyright: ignore[reportUnnecessaryIsInstance]
                 yield Drawing(item, self)
 
     @property
@@ -185,9 +183,7 @@ def style(self) -> CharacterStyle:
         property to |None| removes any directly-applied character style.
         """
         style_id = self._r.style
-        return cast(
-            CharacterStyle, self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER)
-        )
+        return cast(CharacterStyle, self.part.get_style(style_id, WD_STYLE_TYPE.CHARACTER))
 
     @style.setter
     def style(self, style_or_name: str | CharacterStyle | None):