xmlch: add BaseOxmlElement.xpath()

Steve Canny · Steve Canny · commit aba0a294a40c · 2014-06-15T19:30:28.000-07:00
diff --git a/docx/opc/package.py b/docx/opc/package.py
@@ -9,7 +9,7 @@
 
 from .compat import cls_method_fn
 from .constants import RELATIONSHIP_TYPE as RT
-from .oxml import CT_Relationships, nsmap, serialize_part_xml
+from .oxml import CT_Relationships, serialize_part_xml
 from .packuri import PACKAGE_URI, PackURI
 from .pkgreader import PackageReader
 from .pkgwriter import PackageWriter
@@ -301,7 +301,7 @@ def _rel_ref_count(self, rId):
         identified by *rId*.
         """
         assert self._element is not None
-        rIds = self._element.xpath('//@r:id', namespaces=nsmap)
+        rIds = self._element.xpath('//@r:id')
         return len([_rId for _rId in rIds if _rId == rId])
 
     # ----------------------------------------------------------------
diff --git a/docx/oxml/parts/numbering.py b/docx/oxml/parts/numbering.py
@@ -6,7 +6,7 @@
 
 from .. import OxmlElement
 from ..shared import CT_DecimalNumber
-from ..ns import nsmap, qn
+from ..ns import qn
 from ..xmlchemy import BaseOxmlElement
 
 
@@ -181,7 +181,7 @@ def num_having_numId(self, numId):
         """
         xpath = './w:num[@w:numId="%d"]' % numId
         try:
-            return self.xpath(xpath, namespaces=nsmap)[0]
+            return self.xpath(xpath)[0]
         except IndexError:
             raise KeyError('no <w:num> element with numId %d' % numId)
 
@@ -195,7 +195,7 @@ def _next_numId(self):
         1 and filling any gaps in numbering between existing ``<w:num>``
         elements.
         """
-        numId_strs = self.xpath('./w:num/@w:numId', namespaces=nsmap)
+        numId_strs = self.xpath('./w:num/@w:numId')
         num_ids = [int(numId_str) for numId_str in numId_strs]
         for num in range(1, len(num_ids)+2):
             if num not in num_ids:
diff --git a/docx/oxml/parts/styles.py b/docx/oxml/parts/styles.py
@@ -4,7 +4,7 @@
 Custom element classes related to the styles part
 """
 
-from ..ns import nsmap, qn
+from ..ns import qn
 from ..xmlchemy import BaseOxmlElement
 
 
@@ -29,7 +29,7 @@ def style_having_styleId(self, styleId):
         """
         xpath = './w:style[@w:styleId="%s"]' % styleId
         try:
-            return self.xpath(xpath, namespaces=nsmap)[0]
+            return self.xpath(xpath)[0]
         except IndexError:
             raise KeyError('no <w:style> element with styleId %d' % styleId)
 
diff --git a/docx/oxml/xmlchemy.py b/docx/oxml/xmlchemy.py
@@ -11,7 +11,7 @@
 
 import re
 
-from .ns import NamespacePrefixedTag, qn
+from .ns import NamespacePrefixedTag, nsmap, qn
 from ..compat import Unicode
 
 
@@ -138,6 +138,15 @@ def xml(self):
         """
         return serialize_for_reading(self)
 
+    def xpath(self, xpath_str):
+        """
+        Override of ``lxml`` _Element.xpath() method to provide standard Open
+        XML namespace mapping (``nsmap``) in centralized location.
+        """
+        return super(BaseOxmlElement, self).xpath(
+            xpath_str, namespaces=nsmap
+        )
+
     @property
     def _nsptag(self):
         return NamespacePrefixedTag.from_clark_name(self.tag)
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -12,7 +12,6 @@
 from ..opc.oxml import serialize_part_xml
 from ..opc.package import Part
 from ..oxml import parse_xml
-from ..oxml.ns import nsmap
 from ..shape import InlineShape
 from ..shared import lazyproperty, Parented
 from ..table import Table
@@ -214,4 +213,4 @@ def add_picture(self, image_descriptor):
     def _inline_lst(self):
         body = self._body
         xpath = './w:p/w:r/w:drawing/wp:inline'
-        return body.xpath(xpath, namespaces=nsmap)
+        return body.xpath(xpath)
