opc: refactor _ContentTypeMap.from_xml()

Steve Canny · Steve Canny · commit 6c74e23348dc · 2014-01-18T17:08:43.000-08:00
* extract ._add_default() and ._add_override()
diff --git a/docx/opc/pkgreader.py b/docx/opc/pkgreader.py
@@ -140,14 +140,27 @@ def from_xml(content_types_xml):
         of *content_types_xml*.
         """
         types_elm = oxml_fromstring(content_types_xml)
-        ctmap = _ContentTypeMap()
-        ctmap._overrides = dict(
-            (o.partname, o.content_type) for o in types_elm.overrides
-        )
-        ctmap._defaults = dict(
-            ('.%s' % d.extension, d.content_type) for d in types_elm.defaults
-        )
-        return ctmap
+        ct_map = _ContentTypeMap()
+        for o in types_elm.overrides:
+            ct_map._add_override(o.partname, o.content_type)
+        for d in types_elm.defaults:
+            ct_map._add_default(d.extension, d.content_type)
+        return ct_map
+
+    def _add_default(self, extension, content_type):
+        """
+        Add the default mapping of *extension* to *content_type* to this
+        content type mapping.
+        """
+        ext = '.%s' % extension
+        self._defaults[ext] = content_type
+
+    def _add_override(self, partname, content_type):
+        """
+        Add the default mapping of *partname* to *content_type* to this
+        content type mapping.
+        """
+        self._overrides[partname] = content_type
 
 
 class _SerializedPart(object):
