api: remove old Document.add_picture()

Steve Canny · Steve Canny · commit c617f18b9567 · 2015-02-14T21:53:09.000-08:00
diff --git a/docx/api.py b/docx/api.py
@@ -61,22 +61,8 @@ def add_page_break(self):
     def add_paragraph(self, text='', style=None):
         return self._document.add_paragraph(text, style)
 
-    def add_picture(self, image_path_or_stream, width=None, height=None):
-        """
-        Return a new picture shape added in its own paragraph at the end of
-        the document. The picture contains the image at
-        *image_path_or_stream*, scaled based on *width* and *height*. If
-        neither width nor height is specified, the picture appears at its
-        native size. If only one is specified, it is used to compute
-        a scaling factor that is then applied to the unspecified dimension,
-        preserving the aspect ratio of the image. The native size of the
-        picture is calculated using the dots-per-inch (dpi) value specified
-        in the image file, defaulting to 72 dpi if no value is specified, as
-        is often the case.
-        """
-        run = self.add_paragraph().add_run()
-        picture = run.add_picture(image_path_or_stream, width, height)
-        return picture
+    def add_picture(self, image_descriptor, width=None, height=None):
+        return self._document.add_picture(image_descriptor, width, height)
 
     def add_section(self, start_type=WD_SECTION.NEW_PAGE):
         """
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -19,7 +19,6 @@
 from docx.parts.document import DocumentPart, InlineShapes
 from docx.parts.numbering import NumberingPart
 from docx.section import Section
-from docx.shape import InlineShape
 from docx.styles.styles import Styles
 from docx.table import Table
 from docx.text.run import Run
@@ -90,14 +89,6 @@ def Package_(self, request):
 
 class DescribeDocumentOld(object):
 
-    def it_can_add_a_picture(self, add_picture_fixture):
-        document, image_path_, width, height, run_, picture_ = (
-            add_picture_fixture
-        )
-        picture = document.add_picture(image_path_, width, height)
-        run_.add_picture.assert_called_once_with(image_path_, width, height)
-        assert picture is picture_
-
     def it_can_add_a_section(self, add_section_fixture):
         document, start_type_, section_ = add_section_fixture
         section = document.add_section(start_type_)
@@ -167,15 +158,6 @@ def it_creates_numbering_part_on_first_access_if_not_present(
 
     # fixtures -------------------------------------------------------
 
-    @pytest.fixture
-    def add_picture_fixture(self, request, run_, picture_):
-        document = Document()
-        image_path_ = instance_mock(request, str, name='image_path_')
-        width, height = 100, 200
-        class_mock(request, 'docx.text.paragraph.Run', return_value=run_)
-        run_.add_picture.return_value = picture_
-        return (document, image_path_, width, height, run_, picture_)
-
     @pytest.fixture
     def add_section_fixture(self, document, start_type_, section_):
         return document, start_type_, section_
@@ -295,10 +277,6 @@ def package_(self, request, document_part_):
     def paragraphs_(self, request):
         return instance_mock(request, list)
 
-    @pytest.fixture
-    def picture_(self, request):
-        return instance_mock(request, InlineShape)
-
     @pytest.fixture
     def run_(self, request):
         return instance_mock(request, Run)
