opc: factor leading period out of PackURI.ext

Author: Steve Canny

docx/opc/oxml.py

@@ -113,7 +113,7 @@ def new(ext, content_type):
         """
         xml = '<Default xmlns="%s"/>' % nsmap['ct']
         default = oxml_fromstring(xml)
-        default.set('Extension', ext[1:])
+        default.set('Extension', ext)
         default.set('ContentType', content_type)
         return default
 

docx/opc/packuri.py

@@ -44,11 +44,12 @@ def baseURI(self):
     @property
     def ext(self):
         """
-        The extension portion of this pack URI, e.g. ``'.xml'`` for
-        ``'/ppt/slides/slide1.xml'``. Note that the period is included,
-        consistent with the behavior of :meth:`posixpath.ext`.
+        The extension portion of this pack URI, e.g. ``'xml'`` for
+        ``'/word/document.xml'``. Note the period is not included.
         """
-        return posixpath.splitext(self)[1]
+        # raw_ext is either empty string or starts with period, e.g. '.xml'
+        raw_ext = posixpath.splitext(self)[1]
+        return raw_ext[1:] if raw_ext.startswith('.') else raw_ext
 
     @property
     def filename(self):

docx/opc/pkgreader.py

@@ -32,8 +32,9 @@ def from_file(pkg_file):
         phys_reader = PhysPkgReader(pkg_file)
         content_types = _ContentTypeMap.from_xml(phys_reader.content_types_xml)
         pkg_srels = PackageReader._srels_for(phys_reader, PACKAGE_URI)
-        sparts = PackageReader._load_serialized_parts(phys_reader, pkg_srels,
-                                                      content_types)
+        sparts = PackageReader._load_serialized_parts(
+            phys_reader, pkg_srels, content_types
+        )
         phys_reader.close()
         return PackageReader(content_types, pkg_srels, sparts)
 
@@ -153,8 +154,7 @@ 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
+        self._defaults[extension] = content_type
 
     def _add_override(self, partname, content_type):
         """

docx/opc/pkgwriter.py

@@ -91,8 +91,8 @@ def from_parts(cls, parts):
         ``[Content_Types].xml`` in an OPC package.
         """
         cti = cls()
-        cti._defaults['.rels'] = CT.OPC_RELATIONSHIPS
-        cti._defaults['.xml'] = CT.XML
+        cti._defaults['rels'] = CT.OPC_RELATIONSHIPS
+        cti._defaults['xml'] = CT.XML
         for part in parts:
             cti._add_content_type(part.partname, part.content_type)
         return cti

docx/opc/spec.py

@@ -8,22 +8,22 @@
 
 
 default_content_types = (
-    ('.bin',     CT.PML_PRINTER_SETTINGS),
-    ('.bin',     CT.SML_PRINTER_SETTINGS),
-    ('.bin',     CT.WML_PRINTER_SETTINGS),
-    ('.bmp',     CT.BMP),
-    ('.emf',     CT.X_EMF),
-    ('.fntdata', CT.X_FONTDATA),
-    ('.gif',     CT.GIF),
-    ('.jpe',     CT.JPEG),
-    ('.jpeg',    CT.JPEG),
-    ('.jpg',     CT.JPEG),
-    ('.png',     CT.PNG),
-    ('.rels',    CT.OPC_RELATIONSHIPS),
-    ('.tif',     CT.TIFF),
-    ('.tiff',    CT.TIFF),
-    ('.wdp',     CT.MS_PHOTO),
-    ('.wmf',     CT.X_WMF),
-    ('.xlsx',    CT.SML_SHEET),
-    ('.xml',     CT.XML),
+    ('bin',     CT.PML_PRINTER_SETTINGS),
+    ('bin',     CT.SML_PRINTER_SETTINGS),
+    ('bin',     CT.WML_PRINTER_SETTINGS),
+    ('bmp',     CT.BMP),
+    ('emf',     CT.X_EMF),
+    ('fntdata', CT.X_FONTDATA),
+    ('gif',     CT.GIF),
+    ('jpe',     CT.JPEG),
+    ('jpeg',    CT.JPEG),
+    ('jpg',     CT.JPEG),
+    ('png',     CT.PNG),
+    ('rels',    CT.OPC_RELATIONSHIPS),
+    ('tif',     CT.TIFF),
+    ('tiff',    CT.TIFF),
+    ('wdp',     CT.MS_PHOTO),
+    ('wmf',     CT.X_WMF),
+    ('xlsx',    CT.SML_SHEET),
+    ('xml',     CT.XML),
 )

docx/parts/image.py

@@ -236,7 +236,7 @@ def filename(self):
         """
         if self._image is not None:
             return self._image.filename
-        return 'image%s' % self.partname.ext
+        return 'image.%s' % self.partname.ext
 
     @classmethod
     def from_image(cls, image, partname):

tests/opc/test_oxml.py

@@ -23,7 +23,7 @@ def it_provides_read_access_to_xml_values(self):
         assert default.content_type == 'application/xml'
 
     def it_can_construct_a_new_default_element(self):
-        default = CT_Default.new('.xml', 'application/xml')
+        default = CT_Default.new('xml', 'application/xml')
         expected_xml = a_Default().xml
         assert default.xml == expected_xml
 
@@ -124,8 +124,8 @@ def it_can_construct_a_new_types_element(self):
 
     def it_can_build_types_element_incrementally(self):
         types = CT_Types.new()
-        types.add_default('.xml', 'application/xml')
-        types.add_default('.jpeg', 'image/jpeg')
+        types.add_default('xml', 'application/xml')
+        types.add_default('jpeg', 'image/jpeg')
         types.add_override('/docProps/core.xml', 'app/vnd.type1')
         types.add_override('/ppt/presentation.xml', 'app/vnd.type2')
         types.add_override('/docProps/thumbnail.jpeg', 'image/jpeg')

tests/opc/test_packuri.py

@@ -43,7 +43,7 @@ def it_can_calculate_baseURI(self):
             assert pack_uri.baseURI == expected_baseURI
 
     def it_can_calculate_extension(self):
-        expected_values = ('', '.xml', '.xml')
+        expected_values = ('', 'xml', 'xml')
         for pack_uri, expected_ext in self.cases(expected_values):
             assert pack_uri.ext == expected_ext
 

tests/opc/test_pkgreader.py

@@ -306,7 +306,7 @@ def from_xml_fixture(self):
         expected_overrides = {}
         for entry in entries:
             if entry[0] == 'Default':
-                ext = ('.%s' % entry[1]).lower()
+                ext = entry[1].lower()
                 content_type = entry[2]
                 expected_defaults[ext] = content_type
             elif entry[0] == 'Override':