opc: match Override on case-insensitive partname

Steve Canny · Steve Canny · commit c577869b5ba0 · 2014-01-18T17:22:01.000-08:00
diff --git a/docx/opc/pkgreader.py b/docx/opc/pkgreader.py
@@ -7,10 +7,11 @@
 
 from __future__ import absolute_import
 
+from .constants import RELATIONSHIP_TARGET_MODE as RTM
 from .oxml import oxml_fromstring
 from .packuri import PACKAGE_URI, PackURI
 from .phys_pkg import PhysPkgReader
-from .constants import RELATIONSHIP_TARGET_MODE as RTM
+from .shared import CaseInsensitiveDict
 
 
 class PackageReader(object):
@@ -116,7 +117,7 @@ class _ContentTypeMap(object):
     """
     def __init__(self):
         super(_ContentTypeMap, self).__init__()
-        self._overrides = dict()
+        self._overrides = CaseInsensitiveDict()
         self._defaults = dict()
 
     def __getitem__(self, partname):
diff --git a/docx/opc/shared.py b/docx/opc/shared.py
@@ -4,6 +4,28 @@
 Objects shared by opc modules.
 """
 
+from __future__ import absolute_import, print_function, unicode_literals
+
+
+class CaseInsensitiveDict(dict):
+    """
+    Mapping type that behaves like dict except that it matches without respect
+    to the case of the key. E.g. cid['A'] == cid['a']. Note this is not
+    general-purpose, just complete enough to satisfy opc package needs. It
+    assumes str keys, and that it is created empty; keys passed in constructor
+    are not accounted for
+    """
+    def __contains__(self, key):
+        return super(CaseInsensitiveDict, self).__contains__(key.lower())
+
+    def __getitem__(self, key):
+        return super(CaseInsensitiveDict, self).__getitem__(key.lower())
+
+    def __setitem__(self, key, value):
+        return super(CaseInsensitiveDict, self).__setitem__(
+            key.lower(), value
+        )
+
 
 def lazyproperty(f):
     """
diff --git a/tests/opc/test_pkgreader.py b/tests/opc/test_pkgreader.py
@@ -271,7 +271,8 @@ def it_can_construct_from_ct_item_xml(self, from_xml_fixture):
         assert ct_map._defaults == expected_defaults
         assert ct_map._overrides == expected_overrides
 
-    def it_matches_an_override_on_partname(self, match_override_fixture):
+    def it_matches_an_override_on_case_insensitive_partname(
+            self, match_override_fixture):
         ct_map, partname, content_type = match_override_fixture
         assert ct_map[partname] == content_type
 
@@ -316,6 +317,8 @@ def from_xml_fixture(self):
 
     @pytest.fixture(params=[
         ('/foo/bar.xml', '/foo/bar.xml'),
+        ('/foo/bar.xml', '/FOO/Bar.XML'),
+        ('/FoO/bAr.XmL', '/foo/bar.xml'),
     ])
     def match_override_fixture(self, request):
         partname_str, should_match_partname_str = request.param
