opc: make _ContentTypesItem case-ins on ext

Steve Canny · Steve Canny · commit 5d7cf8198c2a · 2014-01-18T19:36:30.000-08:00
* A partname with a capitalized extension (like .PNG) shall match an
existing Default element having the same extension in lower-case.
* Extension value shall always be lowercase, regardless of the case of
the partname extension. e.g. '/part/name.JPG' causes '&lt;Default
Extension="jpg" …&gt;' to be written.
diff --git a/docx/opc/pkgwriter.py b/docx/opc/pkgwriter.py
@@ -11,6 +11,7 @@
 from .oxml import CT_Types, serialize_part_xml
 from .packuri import CONTENT_TYPES_URI, PACKAGE_URI
 from .phys_pkg import PhysPkgWriter
+from .shared import CaseInsensitiveDict
 from .spec import default_content_types
 
 
@@ -75,7 +76,9 @@ def xml_for(parts):
         appropriate content type and suitable for storage as
         ``[Content_Types].xml`` in an OPC package.
         """
-        defaults = dict((('.rels', CT.OPC_RELATIONSHIPS), ('.xml', CT.XML)))
+        defaults = CaseInsensitiveDict()
+        defaults['.rels'] = CT.OPC_RELATIONSHIPS
+        defaults['.xml'] = CT.XML
         overrides = dict()
         for part in parts:
             _ContentTypesItem._add_content_type(
@@ -90,7 +93,7 @@ def _add_content_type(defaults, overrides, partname, content_type):
         using a default or override as appropriate.
         """
         ext = partname.ext
-        if (ext, content_type) in default_content_types:
+        if (ext.lower(), content_type) in default_content_types:
             defaults[ext] = content_type
         else:
             overrides[partname] = content_type
diff --git a/tests/opc/test_pkgwriter.py b/tests/opc/test_pkgwriter.py
@@ -126,7 +126,7 @@ def _mock_part(self, request, name, partname_str, content_type):
         )
 
     @pytest.fixture(params=[
-        # ('Default',  '/ppt/MEDIA/image.PNG',   CT.PNG),
+        ('Default',  '/ppt/MEDIA/image.PNG',   CT.PNG),
         ('Default',  '/ppt/media/image.xml',   CT.XML),
         ('Default',  '/ppt/media/image.rels',  CT.OPC_RELATIONSHIPS),
         ('Default',  '/ppt/media/image.jpeg',  CT.JPEG),

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ def _mock_part(self, request, name, partname_str, content_type):`
`126`	`126`	`)`
`127`	`127`
`128`	`128`	`@pytest.fixture(params=[`
`129`		`- # ('Default', '/ppt/MEDIA/image.PNG', CT.PNG),`
	`129`	`+ ('Default', '/ppt/MEDIA/image.PNG', CT.PNG),`
`130`	`130`	`('Default', '/ppt/media/image.xml', CT.XML),`
`131`	`131`	`('Default', '/ppt/media/image.rels', CT.OPC_RELATIONSHIPS),`
`132`	`132`	`('Default', '/ppt/media/image.jpeg', CT.JPEG),`