python-docx-oss 0.3.1__py3-none-any.whl → 0.3.2__py3-none-any.whl

docx/__init__.py

@@ -13,7 +13,7 @@ from docx.api import Document
 if TYPE_CHECKING:
     from docx.opc.part import Part
 
-__version__ = "0.3.1"
+__version__ = "0.3.2"
 
 
 __all__ = ["Document"]

docx/oxml/text/hyperlink.py

@@ -37,9 +37,9 @@ class CT_Hyperlink(BaseOxmlElement):
         return self.xpath("./w:r/w:lastRenderedPageBreak")
 
     @property
-    def text(self) -> str:  # pyright: ignore[reportIncompatibleMethodOverride]
+    def texts(self) -> str:
         """The textual content of this hyperlink.
 
         `CT_Hyperlink` stores the hyperlink-text as one or more `w:r` children.
         """
-        return "".join(r.text for r in self.xpath("w:r"))
+        return "".join(r.texts for r in self.xpath("w:r"))

docx/oxml/text/paragraph.py

@@ -93,13 +93,13 @@ class CT_P(BaseOxmlElement):
         pPr.style = style
 
     @property
-    def text(self):  # pyright: ignore[reportIncompatibleMethodOverride]
+    def texts(self) -> str:
         """The textual content of this paragraph.
 
         Inner-content child elements like `w:r` and `w:hyperlink` are translated to
         their text equivalent.
         """
-        return "".join(e.text for e in self.xpath("w:r | w:hyperlink"))
+        return "".join(e.texts for e in self.xpath("w:r | w:hyperlink"))
 
     def _insert_pPr(self, pPr: CT_PPr) -> CT_PPr:
         self.insert(0, pPr)

docx/oxml/text/run.py

@@ -127,29 +127,25 @@ class CT_R(BaseOxmlElement):
         rPr.style = style
 
     @property
-    def text(self) -> str:
+    def texts(self) -> str:
         """The textual content of this run.
 
         Inner-content child elements like `w:tab` are translated to their text
         equivalent.
+
+        Note: We intentionally do NOT define `@property def text` on CT_R or any
+        other oxml element, because doing so overrides lxml's Cython descriptor
+        `_Element.text`, which corrupts lxml `itertext()` on parent elements (such
+        as bare `_Element` revision tags `w:ins`, `w:del`, etc.).
         """
         return "".join(
             str(e) for e in self.xpath("w:br | w:cr | w:noBreakHyphen | w:ptab | w:t | w:tab")
         )
 
-    @text.setter
-    def text(self, text: str):  # pyright: ignore[reportIncompatibleMethodOverride]
-        self.clear_content()
-        _RunContentAppender.append_to_run_from_text(self, text)
-
-    @property
-    def texts(self) -> str:
-        """Alias for `text` property for compatibility with python-docx-oss."""
-        return self.text
-
     @texts.setter
     def texts(self, text: str):
-        self.text = text
+        self.clear_content()
+        _RunContentAppender.append_to_run_from_text(self, text)
 
     def _insert_rPr(self, rPr: CT_RPr) -> CT_RPr:
         self.insert(0, rPr)

docx/oxml/xmlchemy.py

@@ -5,7 +5,7 @@
 from __future__ import annotations
 
 import re
-from typing import TYPE_CHECKING, Any, Callable, Iterator, Sequence, Type, TypeVar
+from typing import TYPE_CHECKING, Any, Callable, Sequence, Type, TypeVar
 
 from lxml import etree
 from lxml.etree import ElementBase, _Element  # pyright: ignore[reportPrivateUsage]
@@ -653,11 +653,6 @@ class ZeroOrOneChoice(_BaseChildElement):
         return "_remove_%s" % self._prop_name
 
 
-# -- raw lxml text/tail accessors, used to bypass `.text` property overrides --
-_raw_text = _Element.text.__get__
-_raw_tail = _Element.tail.__get__
-
-
 # -- lxml typing isn't quite right here, just ignore this error on _Element --
 class BaseOxmlElement(etree.ElementBase, metaclass=MetaOxmlElement):
     """Effective base class for all custom element classes.
@@ -688,22 +683,6 @@ class BaseOxmlElement(etree.ElementBase, metaclass=MetaOxmlElement):
             self.append(elm)
         return elm
 
-    def itertext(self, tag: Any | None = None, *tags: Any, with_tail: bool = True) -> Iterator[str]:
-        """Iterate over text content of this element and its descendants.
-
-        Bypasses the overridden `.text` properties on custom oxml element classes (such as
-        `CT_P`, `CT_R`, `CT_Hyperlink`), which would otherwise duplicate text, so standard
-        lxml `itertext()` semantics are preserved.
-        """
-        for node in self.iter(tag, *tags):
-            text = _raw_text(node)
-            if text:
-                yield text
-            if with_tail and node is not self:
-                tail = _raw_tail(node)
-                if tail:
-                    yield tail
-
     def remove_all(self, *tagnames: str) -> None:
         """Remove child elements with tagname (e.g. "a:p") in `tagnames`."""
         for tagname in tagnames:

docx/table.py

@@ -281,7 +281,7 @@ class _Cell(BlockItemContainer):
         tc.clear_content()
         p = tc.add_p()
         r = p.add_r()
-        r.text = text
+        r.texts = text
 
     @property
     def vertical_alignment(self):

docx/text/hyperlink.py

@@ -98,7 +98,7 @@ class Hyperlink(Parented):
         respectively. Note that rendered page-breaks can occur within a hyperlink but
         they are not reflected in this text.
         """
-        return self._hyperlink.text
+        return self._hyperlink.texts
 
     @property
     def url(self) -> str:

docx/text/paragraph.py

@@ -160,7 +160,7 @@ class Paragraph(StoryChild):
         character is mapped to a line break. Paragraph-level formatting, such as style,
         is preserved. All run-level formatting, such as bold or italic, is removed.
         """
-        return self._p.text
+        return self._p.texts
 
     @text.setter
     def text(self, text: str | None):

docx/text/run.py

@@ -233,11 +233,11 @@ class Run(StoryChild):
         `<w:cr/>` element. Any existing run content is replaced. Run formatting is
         preserved.
         """
-        return self._r.text
+        return self._r.texts
 
     @text.setter
     def text(self, text: str):
-        self._r.text = text
+        self._r.texts = text
 
     @property
     def underline(self) -> bool | WD_UNDERLINE | None:

{python_docx_oss-0.3.1.dist-info → python_docx_oss-0.3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-docx-oss
-Version: 0.3.1
+Version: 0.3.2
 Summary: Create, read, and update Microsoft Word .docx files.
 Author: Ethan St Lee
 License-Expression: MIT
@@ -155,6 +155,11 @@ available through `Document.add_float_picture()` and `Run.add_float_picture()`.
 
 - The project maintains broad compatibility with the public `python-docx` API while
   following its own versioning and product roadmap.
+- Clean lxml integration: Low-level OXML elements avoid shadowing lxml's Cython
+  `_Element.text` descriptor (using `.texts` internally). This guarantees that standard
+  `element.itertext()` on parent elements and untyped revision nodes (`w:ins`, `w:del`,
+  `w:txbxContent`) never duplicates text, while high-level proxy APIs (`paragraph.text`,
+  `run.text`) remain fully compatible with `python-docx`.
 - Compatibility does not extend to every private or internal `python-docx` API. Test
   those integrations before migrating production systems.
 - The SDK focuses exclusively on DOCX. It is not a general XLSX/PPTX Office suite.

{python_docx_oss-0.3.1.dist-info → python_docx_oss-0.3.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-docx/__init__.py,sha256=AL2CZNiK_a766gdK59Vvj4oV-6swa9kKNaap3FfZKco,2102
+docx/__init__.py,sha256=X3x8P22c_YHltfHJxey1Nh8592hDDCnPKEr6ErJn4Ls,2102
 docx/api.py,sha256=jIojXW4IRDEXQqaqvmOZbzBvNeyRXv9ntHByxd-Kb0M,1518
 docx/blkcntnr.py,sha256=_xe7Uz3RBCz4TPKXpIzRxtGg-1YPb3gAG9YvsSUyoLU,3525
 docx/comments.py,sha256=MmaP7U9mZOUFsRhaZNIbXatqOOA8-pOC6UlqWAuTHsc,6385
@@ -10,7 +10,7 @@ docx/section.py,sha256=r2SLP6EXCtHPmv8PtaTuYZg1Wy8l9MoVHlA9JHT3SiA,18412
 docx/settings.py,sha256=tWJUOj3KABgk_3bXoxhIHVWVY5HmmKKl2tsqic2YN_c,1082
 docx/shape.py,sha256=5agasreXHsVIOdd1z8d-3erPvlsbBRJQjHQ0ILSfeaI,2969
 docx/shared.py,sha256=N6YIJKiQev-0XIC0ND9fJg1eVt1mG_MELnTawf_e-9g,13506
-docx/table.py,sha256=EFxbVD3aEbLOqdes5cpGt3xXbPzbZLFG0Sl5OPHSrhY,19477
+docx/table.py,sha256=b2Z8Q8E3IIMLNh6IQCQmUHrD8Hs0HGpwqVS8hJOqLlU,19478
 docx/types.py,sha256=BgnXlRS-roPaNF1pbQX4ZO1AHqIIjIN7qMwAcaDniSE,848
 docx/dml/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docx/dml/color.py,sha256=O7xeVwtCbOPW1aNKSHEBqcxpYnOUFMjKKv2vc2riJGo,4439
@@ -70,15 +70,15 @@ docx/oxml/shared.py,sha256=iAqDOcy-DnOm5GGsSZXLSemNejSqCjlzhB86lPEtDYM,1857
 docx/oxml/simpletypes.py,sha256=2pD4vgEZThJpCB4M-L8hP7uTIXglndlZRdNruvDZwm0,13019
 docx/oxml/styles.py,sha256=1U24kcC9hhzMPzNcg19RVCUJl1_qWauXCJIHG_Kp0Io,10643
 docx/oxml/table.py,sha256=qS46a_Ts3KzNygUNeUxaTIVNDJZbbWNJqMseo3ZVaRA,33610
-docx/oxml/xmlchemy.py,sha256=5cahsGwUamMOWLo2CzdVZb6mrlFWgZbDGpxXef4NZ4g,27042
+docx/oxml/xmlchemy.py,sha256=QFJNxaM6YQeozA238LNhRu_1j_NqZgta7aiPxCsQ0Rs,26192
 docx/oxml/dml/CT_ExtensionList.py,sha256=drQvDl9Zo10H1JMtHdI8AUxlX0U0NFPKwIyHAlUhDTk,1216
 docx/oxml/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docx/oxml/text/font.py,sha256=s5MJwoei24s1xdhtsI1P02wqI6mLpvkLTCXr73EWNWI,11900
-docx/oxml/text/hyperlink.py,sha256=tx6SQiYaa123-a0JfUS80mtACOYwNoy24Trga2Shgn8,1467
+docx/oxml/text/hyperlink.py,sha256=wcyip51zHHPPCLFRVBGmItFf6xxOYI8QD0Jyvjrzx4c,1416
 docx/oxml/text/pagebreak.py,sha256=1iK12GAowZpFRjVAmnZ_Mpqn7O0PqPSrVc2myUc4KM4,11192
-docx/oxml/text/paragraph.py,sha256=op4Cy4LjcSIxDD1CQIKeRbUsBL5ABVR8cYKb3KynlmQ,3538
+docx/oxml/text/paragraph.py,sha256=eIopq-H6EbtCPxWbiS_wBSf8RvZeQ2Q7OJv7-Hyt3gM,3494
 docx/oxml/text/parfmt.py,sha256=5TYCf-QfcwlECXUkrLSYFfewFA1JieKGTtm3X01fu64,12221
-docx/oxml/text/run.py,sha256=W8vwOomvk1oGzAq2BqDgyVftKsSi5LK9_vlADVcMgpg,11238
+docx/oxml/text/run.py,sha256=pz8GAWT0uUq-V70fxFGKt1Q64zHGQW_d59GjyXfc4cA,11275
 docx/parts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docx/parts/comments.py,sha256=Dmxh_i8ADRo-wLfO9LV0Lyho5XC_76oU1NJN8itw8lc,1760
 docx/parts/customxml.py,sha256=hbwDmPwR-1RRLOOFhmiPd0B-dNwpfZFrOxIaGU4UlG4,1920
@@ -122,14 +122,14 @@ docx/templates/default-docx-template/word/_rels/document.xml.rels,sha256=Tyt7R9i
 docx/templates/default-docx-template/word/theme/theme1.xml,sha256=46irfbnKevylb18oIKVui2YAFsZHdzVVsGCwoCrHaUE,10939
 docx/text/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 docx/text/font.py,sha256=AJI05dO5nUSXsutxHNsquZkqdCA33x68ovi3IV4C1nc,14854
-docx/text/hyperlink.py,sha256=H7YGCH85i7EDcPQcYoLh4MOx_w-xNSucA5bAgI3HtVQ,5257
+docx/text/hyperlink.py,sha256=bWU9yHEDrHK5Vngj35EuSJkANd593-6LgJji1Vo6FTo,5258
 docx/text/pagebreak.py,sha256=sI1yMVotkBtn1u5DJ9L04FkC01QoAwcyVSdgGPAkJIY,4950
-docx/text/paragraph.py,sha256=N3F62_JRQZYaumuoaJXKCDnRSw2DIiOwzyMPV2Jd7GI,6828
+docx/text/paragraph.py,sha256=5caYCpNr9D-6pnk0aE5_HBkx5Bkc3VUWaj6u115Z9i8,6829
 docx/text/parfmt.py,sha256=70M75HFo7ydpqmIdZjkV711muyrsBGdr4WZscF3YVJY,10339
-docx/text/run.py,sha256=tsW8dXOE4VnqEM7cJz_uU2Vq3qgdnrMGzyDq9x5jvE4,10800
+docx/text/run.py,sha256=QtIRn3mW_MMLgbRIfJhRmnKpDfcq7VnJEQKn1pfsY78,10802
 docx/text/tabstops.py,sha256=bJN98GWW22f4Sqg0dQbyUcnuOn65fHsNZuCGswI03_c,3896
-python_docx_oss-0.3.1.dist-info/licenses/LICENSE,sha256=lf2yZv-riPwFeah3IMDeG0zqI6fXcV9T9YOToeG54NM,1164
-python_docx_oss-0.3.1.dist-info/METADATA,sha256=dSJ6OR23JAVG4Y1y-ABz0aWEhB2zuIZG-YpWzhuNoK8,7900
-python_docx_oss-0.3.1.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
-python_docx_oss-0.3.1.dist-info/top_level.txt,sha256=zkbrD3gmyqHpD_XhHe7lCbr2M5vT229nJ4UFqF5VjIs,5
-python_docx_oss-0.3.1.dist-info/RECORD,,
+python_docx_oss-0.3.2.dist-info/licenses/LICENSE,sha256=lf2yZv-riPwFeah3IMDeG0zqI6fXcV9T9YOToeG54NM,1164
+python_docx_oss-0.3.2.dist-info/METADATA,sha256=CGUTu6udBAci7DEXVSKAbXjhl-vIHavNFmjcIidrSrY,8303
+python_docx_oss-0.3.2.dist-info/WHEEL,sha256=YVMoNqKzERt-wjUZwJ33xBGAwnFl-4cqbYkTtWa4itE,91
+python_docx_oss-0.3.2.dist-info/top_level.txt,sha256=zkbrD3gmyqHpD_XhHe7lCbr2M5vT229nJ4UFqF5VjIs,5
+python_docx_oss-0.3.2.dist-info/RECORD,,