img: add ImagePart.filename

Steve Canny · Steve Canny · commit dde7784eaff2 · 2013-12-30T00:38:44.000-08:00
diff --git a/docx/parts/image.py b/docx/parts/image.py
@@ -235,7 +235,9 @@ def filename(self):
         case a default extension is applied based on the detected MIME type
         of the image.
         """
-        raise NotImplementedError
+        if self._image is not None:
+            return self._image.filename
+        return 'image%s' % self.partname.ext
 
     @classmethod
     def from_image(cls, image, partname):
diff --git a/tests/parts/test_image.py b/tests/parts/test_image.py
@@ -112,6 +112,10 @@ def it_knows_its_default_dimensions_in_EMU(self, dimensions_fixture):
         assert image_part.default_cx == cx
         assert image_part.default_cy == cy
 
+    def it_knows_its_filename(self, filename_fixture):
+        image_part, expected_filename = filename_fixture
+        assert image_part.filename == expected_filename
+
     # fixtures -------------------------------------------------------
 
     @pytest.fixture
@@ -137,6 +141,18 @@ def dimensions_fixture(self, request):
 
         return image_part, expected_cx, expected_cy
 
+    @pytest.fixture(params=['loaded', 'new'])
+    def filename_fixture(self, request, image_):
+        partname = PackURI('/word/media/image666.png')
+        if request.param == 'loaded':
+            image_part = ImagePart(partname, None, None, None)
+            expected_filename = 'image.png'
+        elif request.param == 'new':
+            image_.filename = 'foobar.PXG'
+            image_part = ImagePart(partname, None, None, image_)
+            expected_filename = image_.filename
+        return image_part, expected_filename
+
     @pytest.fixture
     def from_image_fixture(self, image_, partname_, ImagePart__init__):
         return image_, partname_, ImagePart__init__
