img: final fixups to pass acceptance test

Steve Canny · Steve Canny · commit 12336e708518 · 2013-12-30T02:50:10.000-08:00
diff --git a/docx/api.py b/docx/api.py
@@ -39,7 +39,7 @@ class _Document(object):
     """
     def __init__(self, package, document_part):
         super(_Document, self).__init__()
-        self._document = document_part
+        self._document_part = document_part
         self._package = package
 
     def add_inline_picture(self, image_path_or_stream):
@@ -55,14 +55,14 @@ def body(self):
         """
         Return a reference to the |_Body| instance for this document.
         """
-        return self._document.body
+        return self._document_part.body
 
     @property
     def inline_shapes(self):
         """
         Return a reference to the |InlineShapes| instance for this document.
         """
-        return self._document.inline_shapes
+        return self._document_part.inline_shapes
 
     def save(self, file_):
         """
diff --git a/docx/oxml/shape.py b/docx/oxml/shape.py
@@ -14,6 +14,10 @@ class CT_Blip(OxmlBaseElement):
     ``<a:blip>`` element, specifies image source and adjustments such as
     alpha and tint.
     """
+    @property
+    def embed(self):
+        return self.get(qn('r:embed'))
+
     @property
     def link(self):
         return self.get(qn('r:link'))
diff --git a/docx/parts/image.py b/docx/parts/image.py
@@ -259,8 +259,7 @@ 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
+        return cls(partname, content_type, blob)
 
     @property
     def sha1(self):
diff --git a/features/shp-add-inline-picture.feature b/features/shp-add-inline-picture.feature
@@ -3,7 +3,6 @@ Feature: Add inline picture
   As a python-docx developer
   I need the ability to add an inline picture to a document
 
-  @wip
   Scenario: Add inline picture to document
     Given a document
      When I add an inline picture to the document
diff --git a/features/steps/shape.py b/features/steps/shape.py
@@ -104,9 +104,9 @@ def then_the_document_contains_the_inline_picture(context):
     picture_shape = document.inline_shapes[0]
     blip = picture_shape._inline.graphic.graphicData.pic.blipFill.blip
     rId = blip.embed
-    image_part = document.related_parts[rId]
+    image_part = document._document_part.related_parts[rId]
     image_sha1 = hashlib.sha1(image_part.blob).hexdigest()
-    expected_sha1 = '92abcF0eab86674as0e029342309023423'
+    expected_sha1 = '79769f1e202add2e963158b532e36c2c0f76a70c'
     assert image_sha1 == expected_sha1, (
         "image SHA1 doesn't match, expected %s, got %s" %
         (expected_sha1, image_sha1)
diff --git a/tests/test_api.py b/tests/test_api.py
@@ -75,11 +75,11 @@ class Describe_Document(object):
 
     def it_provides_access_to_the_document_body(self, document):
         body = document.body
-        assert body is document._document.body
+        assert body is document._document_part.body
 
     def it_provides_access_to_the_document_inline_shapes(self, document):
         body = document.inline_shapes
-        assert body is document._document.inline_shapes
+        assert body is document._document_part.inline_shapes
 
     def it_can_add_an_inline_picture(self, add_picture_fixture):
         document, inline_shapes, image_path_or_stream_, picture_shape_ = (
diff --git a/tests/test_package.py b/tests/test_package.py
@@ -21,7 +21,10 @@ class DescribePackage(object):
 
     def it_gathers_package_image_parts_after_unmarshalling(self):
         package = Package.open(docx_path('having-images'))
-        assert len(package.image_parts) == 3
+        image_parts = package.image_parts
+        assert len(image_parts) == 3
+        for image_part in image_parts:
+            assert isinstance(image_part, ImagePart)
 
 
 class DescribeImageParts(object):
