img: add _Tiff.content_type

Steve Canny · Steve Canny · commit 80c395ded6da · 2014-02-27T12:08:36.000-08:00
diff --git a/docx/image/constants.py b/docx/image/constants.py
@@ -95,10 +95,11 @@ def is_standalone(cls, marker_code):
 
 class MIME_TYPE(object):
     """
-    Image content types.
+    Image content types
     """
     JPEG = 'image/jpeg'
     PNG = 'image/png'
+    TIFF = 'image/tiff'
 
 
 class TAG(object):
diff --git a/docx/image/tiff.py b/docx/image/tiff.py
@@ -2,7 +2,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from .constants import TIFF_FLD, TIFF_TAG
+from .constants import MIME_TYPE, TIFF_FLD, TIFF_TAG
 from .helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 from .image import Image
 
@@ -12,6 +12,19 @@ class Tiff(Image):
     Image header parser for TIFF images. Handles both big and little endian
     byte ordering.
     """
+    def __init__(self, blob, filename, cx, cy, horz_dpi, vert_dpi):
+        super(Tiff, self).__init__(blob, filename, cx, cy, {})
+        self._horz_dpi = horz_dpi
+        self._vert_dpi = vert_dpi
+
+    @property
+    def content_type(self):
+        """
+        Return the MIME type of this TIFF image, unconditionally the string
+        ``image/tiff``.
+        """
+        return MIME_TYPE.TIFF
+
     @classmethod
     def from_stream(cls, stream, blob, filename):
         """
diff --git a/tests/image/test_tiff.py b/tests/image/test_tiff.py
@@ -11,7 +11,7 @@
 from mock import call
 
 from docx.compat import BytesIO
-from docx.image.constants import TIFF_TAG
+from docx.image.constants import MIME_TYPE, TIFF_TAG
 from docx.image.helpers import BIG_ENDIAN, LITTLE_ENDIAN, StreamReader
 from docx.image.tiff import (
     _IfdEntries, _IfdEntry, _IfdEntryFactory, _IfdParser, Tiff, _TiffParser
@@ -35,6 +35,10 @@ def it_can_construct_from_a_tiff_stream(self, from_stream_fixture):
         )
         assert isinstance(tiff, Tiff)
 
+    def it_knows_its_content_type(self):
+        tiff = Tiff(None, None, None, None, None, None)
+        assert tiff.content_type == MIME_TYPE.TIFF
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
