From 83cb03375156a9825936f4e614fbe6907ff3f228 Mon Sep 17 00:00:00 2001
From: Waket Zheng <waketzheng@gmail.com>
Date: Sun, 21 Jun 2026 10:58:27 +0800
Subject: [PATCH 1/2] refactor: remove noqa in the `__init__` file

---
 docxtpl/__init__.py | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py
index 5559d4f..ebb72ea 100644
--- a/docxtpl/__init__.py
+++ b/docxtpl/__init__.py
@@ -6,11 +6,20 @@
 """
 
 __version__ = "0.20.2"
+__all__ = (
+    "InlineImage",
+    "Listing",
+    "RichText",
+    "R",
+    "RichTextParagraph",
+    "RP",
+    "DocxTemplate",
+    "Subdoc",
+)
 
-# flake8: noqa
 from .inline_image import InlineImage
 from .listing import Listing
-from .richtext import RichText, R, RichTextParagraph, RP
+from .richtext import RP, R, RichText, RichTextParagraph
 from .template import DocxTemplate
 
 try:

From 32a2dba6ab67fa6111592f1269211fc4d10dec90 Mon Sep 17 00:00:00 2001
From: Waket Zheng <waketzheng@gmail.com>
Date: Thu, 30 Jul 2026 21:14:35 +0800
Subject: [PATCH 2/2] Fix subdoc import error when docxcompose is not installed

---
 docxtpl/__init__.py | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docxtpl/__init__.py b/docxtpl/__init__.py
index ebb72ea..0f351d6 100644
--- a/docxtpl/__init__.py
+++ b/docxtpl/__init__.py
@@ -7,14 +7,13 @@
 
 __version__ = "0.20.2"
 __all__ = (
+    "RP",
+    "DocxTemplate",
     "InlineImage",
     "Listing",
-    "RichText",
     "R",
+    "RichText",
     "RichTextParagraph",
-    "RP",
-    "DocxTemplate",
-    "Subdoc",
 )
 
 from .inline_image import InlineImage
@@ -24,5 +23,7 @@
 
 try:
     from .subdoc import Subdoc
+
+    __all__ += ("Subdoc",)
 except ImportError:
     pass