img: add width, height, and content_type properties

Steve Canny · Steve Canny · commit 73132baf7c1a · 2014-02-27T12:08:34.000-08:00
diff --git a/docx/image/constants.py b/docx/image/constants.py
@@ -5,7 +5,17 @@
 """
 
 
+class MIME_TYPE(object):
+    """
+    Image content types.
+    """
+    PNG = 'image/png'
+
+
 class TAG(object):
+    """
+    Identifiers for image attribute tags.
+    """
 
     PX_WIDTH = 'px_width'
     PX_HEIGHT = 'px_height'
diff --git a/docx/image/image.py b/docx/image/image.py
@@ -44,6 +44,20 @@ def from_file(cls, image_descriptor):
             filename = None
         return cls._from_stream(stream, blob, filename)
 
+    @property
+    def px_width(self):
+        """
+        The horizontal pixel dimension of the image
+        """
+        return self._px_width
+
+    @property
+    def px_height(self):
+        """
+        The vertical pixel dimension of the image
+        """
+        return self._px_height
+
     @classmethod
     def _from_stream(cls, stream, blob, filename=None):
         """
diff --git a/docx/image/png.py b/docx/image/png.py
@@ -2,7 +2,7 @@
 
 from __future__ import absolute_import, division, print_function
 
-from .constants import TAG
+from .constants import MIME_TYPE, TAG
 from .exceptions import InvalidImageStreamError
 from .helpers import StreamReader
 from .image import Image
@@ -20,6 +20,14 @@ class Png(Image):
     def __init__(self, blob, filename, cx, cy, attrs):
         super(Png, self).__init__(blob, filename, cx, cy, attrs)
 
+    @property
+    def content_type(self):
+        """
+        MIME content type for this image, unconditionally `image/png` for
+        PNG images.
+        """
+        return MIME_TYPE.PNG
+
     @classmethod
     def from_stream(cls, stream, blob, filename):
         """
diff --git a/features/img-characterize-image.feature b/features/img-characterize-image.feature
@@ -14,5 +14,5 @@ Feature: Characterize an image file
       And the image has <vert_dpi> vertical dpi
 
    Examples: Image file characteristics
-     | filename | mime_type | cx | cy | horz_dpi | vert_dpi |
-     | test.png | image/png | 11 | 22 |   333    |   444    |
+     | filename | mime_type | cx  |  cy  | horz_dpi | vert_dpi |
+     | test.png | image/png | 901 | 1350 |   333    |   444    |
