img: remove now-dead ImageCollection

* remove PartCollection, as this was the last remaining subclass.
* Remove tests and test file.
* remove now-dead Package.after_unmarshal()

Author: Steve Canny

pptx/package.py

@@ -12,7 +12,7 @@
 from pptx.opc.constants import RELATIONSHIP_TYPE as RT
 from pptx.opc.package import OpcPackage
 from pptx.parts.coreprops import CoreProperties
-from pptx.parts.image import Image, ImageCollection, ImagePart
+from pptx.parts.image import Image, ImagePart
 from pptx.util import lazyproperty
 
 
@@ -31,14 +31,6 @@ class Package(OpcPackage):
         os.path.split(__file__)[0], 'templates', 'default.pptx'
     )
 
-    def after_unmarshal(self):
-        """
-        Called by loading code after all parts and relationships have been
-        loaded, to afford the opportunity for any required post-processing.
-        """
-        # gather image parts into _images
-        self._images.load(self.parts)
-
     @lazyproperty
     def core_properties(self):
         """
@@ -79,14 +71,6 @@ def presentation(self):
         """
         return self.main_document
 
-    @lazyproperty
-    def _images(self):
-        """
-        Collection containing a reference to each of the image parts in this
-        package.
-        """
-        return ImageCollection()
-
     @lazyproperty
     def _image_parts(self):
         """

pptx/parts/image.py

@@ -16,9 +16,7 @@
 from StringIO import StringIO
 
 from pptx.opc.package import Part
-from pptx.opc.packuri import PackURI
 from pptx.opc.spec import image_content_types
-from pptx.parts.part import PartCollection
 from pptx.util import lazyproperty, Px
 
 
@@ -162,61 +160,6 @@ def _size(self):
         return width_px, height_px
 
 
-class ImageCollection(PartCollection):
-    """
-    Immutable sequence of images, typically belonging to an instance of
-    |Package|. An image part containing a particular image blob appears only
-    once in an instance, regardless of how many times it is referenced by a
-    pic shape in a slide.
-    """
-    def __init__(self):
-        super(ImageCollection, self).__init__()
-
-    def add_image(self, file):
-        """
-        Return image part containing the image in *file*, which is either a
-        path to an image file or a file-like object containing an image. If an
-        image instance containing this same image already exists, that
-        instance is returned. If it does not yet exist, a new one is created.
-        """
-        # use Image constructor to validate and characterize image file
-        partname = PackURI('/ppt/media/image1.jpeg')  # dummy just for baseURI
-        image = ImagePart.new(partname, file)
-        # return matching image if found
-        for existing_image in self._values:
-            if existing_image.sha1 == image.sha1:
-                return existing_image
-        # otherwise add it to collection and return new image
-        self._values.append(image)
-        self._rename_images()
-        return image
-
-    def load(self, parts):
-        """
-        Load the image collection with all the image parts in iterable
-        *parts*.
-        """
-        def is_image_part(part):
-            return (
-                isinstance(part, ImagePart) and
-                part.partname.startswith('/ppt/media/')
-            )
-        for part in parts:
-            if is_image_part(part):
-                self.add_part(part)
-
-    def _rename_images(self):
-        """
-        Assign partnames like ``/ppt/media/image9.png`` to all images in the
-        collection. The name portion is always ``image``. The number part
-        forms a continuous sequence starting at 1 (e.g. 1, 2, 3, ...). The
-        extension is preserved during renaming.
-        """
-        for idx, image in enumerate(self._values):
-            partname_str = '/ppt/media/image%d.%s' % (idx+1, image.ext)
-            image.partname = PackURI(partname_str)
-
-
 class Image(object):
     """
     Immutable value object representing an image such as a JPEG, PNG, or GIF.

pptx/parts/part.py

@@ -12,7 +12,6 @@
 
 from pptx.opc.constants import CONTENT_TYPE as CT
 from pptx.parts.image import Image, ImagePart
-from pptx.package import Package
 from pptx.util import Px
 
 from ..unitutil.file import absjoin, test_file_dir
@@ -156,30 +155,3 @@ def image_(self, request):
     @pytest.fixture
     def _init_(self, request):
         return initializer_mock(request, Image)
-
-
-class DescribeImageCollection(object):
-
-    def it_finds_a_matching_image_part_if_there_is_one(self):
-        pkg = Package.open(images_pptx_path)
-        matching_idx = 4
-        matching_image = pkg._images[matching_idx]
-        # exercise ---------------------
-        image = pkg._images.add_image(test_image_path)
-        # verify -----------------------
-        msg = ("expected images[%d], got images[%d]"
-               % (matching_idx, pkg._images.index(image)))
-        assert image is matching_image, msg
-
-    def it_adds_an_image_part_if_no_matching_found(self):
-        pkg = Package.open(images_pptx_path)
-        expected_partname = '/ppt/media/image8.png'
-        expected_len = len(pkg._images) + 1
-        expected_sha1 = '79769f1e202add2e963158b532e36c2c0f76a70c'
-        # exercise ---------------------
-        image = pkg._images.add_image(new_image_path)
-        # verify -----------------------
-        expected = (expected_partname, expected_len, expected_sha1)
-        actual = (image.partname, len(pkg._images), image.sha1)
-        msg = "\nExpected: %s\n     Got: %s" % (expected, actual)
-        assert actual == expected, msg

tests/parts/test_image.py

@@ -16,15 +16,12 @@
 from pptx.parts.presentation import PresentationPart
 
 
-from .unitutil.file import absjoin, test_file_dir
+from .unitutil.file import absjoin
 from .unitutil.mock import (
     class_mock, instance_mock, method_mock, property_mock
 )
 
 
-images_pptx_path = absjoin(test_file_dir, 'with_images.pptx')
-
-
 class DescribePackage(object):
 
     def it_loads_default_template_when_opened_with_no_path(self):
@@ -37,10 +34,6 @@ def it_loads_default_template_when_opened_with_no_path(self):
         assert slide_layouts is not None
         assert len(slide_layouts) == 11
 
-    def it_gathers_package_image_parts_on_open(self):
-        pkg = Package.open(images_pptx_path)
-        assert len(pkg._images) == 7
-
     def it_provides_ref_to_package_presentation_part(self):
         pkg = Package.open()
         assert isinstance(pkg.presentation, PresentationPart)