img: add __init__() and load() overrides to ImagePart

Steve Canny · Steve Canny · commit 3272199f7c74 · 2013-12-29T18:40:57.000-08:00
diff --git a/docx/parts/document.py b/docx/parts/document.py
@@ -60,8 +60,8 @@ def inline_shapes(self):
     @classmethod
     def load(cls, partname, content_type, blob, package):
         document_elm = oxml_fromstring(blob)
-        document = cls(partname, content_type, document_elm, package)
-        return document
+        document_part = cls(partname, content_type, document_elm, package)
+        return document_part
 
     @property
     def next_id(self):
diff --git a/docx/parts/image.py b/docx/parts/image.py
@@ -196,6 +196,10 @@ class ImagePart(Part):
     An image part. Corresponds to the target part of a relationship with type
     RELATIONSHIP_TYPE.IMAGE.
     """
+    def __init__(self, partname, content_type, blob, image=None):
+        super(ImagePart, self).__init__(partname, content_type, blob)
+        self._image = image
+
     @property
     def filename(self):
         """
@@ -225,6 +229,15 @@ def height(self):
         """
         raise NotImplementedError
 
+    @classmethod
+    def load(cls, partname, content_type, blob, package):
+        """
+        Called by ``docx.opc.package.PartFactory`` to load an image part from
+        a package being opened by ``Document(...)`` call.
+        """
+        image_part = cls(partname, content_type, blob)
+        return image_part
+
     @property
     def sha1(self):
         """
diff --git a/tests/parts/test_image.py b/tests/parts/test_image.py
@@ -99,7 +99,7 @@ def it_is_used_by_PartFactory_to_construct_image_part(self, load_fixture):
         )
         assert part is image_part_
 
-    def it_can_construct_from_image_instance(self, from_image_fixture):
+    def it_can_construct_from_an_Image_instance(self, from_image_fixture):
         image_, partname_, ImagePart__init__ = from_image_fixture
         image_part = ImagePart.from_image(image_, partname_)
         ImagePart__init__.assert_called_once_with(

Original file line number	Diff line number	Diff line change
`@@ -99,7 +99,7 @@ def it_is_used_by_PartFactory_to_construct_image_part(self, load_fixture):`
`99`	`99`	`)`
`100`	`100`	`assert part is image_part_`
`101`	`101`
`102`		`- def it_can_construct_from_image_instance(self, from_image_fixture):`
	`102`	`+ def it_can_construct_from_an_Image_instance(self, from_image_fixture):`
`103`	`103`	`image_, partname_, ImagePart__init__ = from_image_fixture`
`104`	`104`	`image_part = ImagePart.from_image(image_, partname_)`
`105`	`105`	`ImagePart__init__.assert_called_once_with(`