img: rename existing Image to Image_OLD

Steve Canny · Steve Canny · commit 3d1ddeefefc1 · 2014-02-27T12:08:33.000-08:00
New image object will be developed in increments until it can replace
Image_OLD.
diff --git a/docx/image/__init__.py b/docx/image/__init__.py
@@ -22,14 +22,14 @@
 from docx.shared import lazyproperty
 
 
-class Image(object):
+class Image_OLD(object):
     """
     A helper object that knows how to analyze an image file.
     """
     def __init__(
             self, blob, filename, content_type, px_width, px_height,
             horz_dpi, vert_dpi):
-        super(Image, self).__init__()
+        super(Image_OLD, self).__init__()
         self._blob = blob
         self._filename = filename
         self._content_type = content_type
diff --git a/docx/package.py b/docx/package.py
@@ -9,7 +9,7 @@
 from docx.opc.constants import RELATIONSHIP_TYPE as RT
 from docx.opc.package import OpcPackage
 from docx.opc.packuri import PackURI
-from docx.parts.image import Image, ImagePart
+from docx.parts.image import Image_OLD, ImagePart
 from docx.shared import lazyproperty
 
 
@@ -72,7 +72,7 @@ def get_or_add_image_part(self, image_descriptor):
         *image_descriptor*, newly created if a matching one is not present in
         the collection.
         """
-        image = Image.from_file(image_descriptor)
+        image = Image_OLD.from_file(image_descriptor)
         matching_image_part = self._get_by_sha1(image.sha1)
         if matching_image_part is not None:
             return matching_image_part
diff --git a/docx/parts/image.py b/docx/parts/image.py
@@ -10,7 +10,7 @@
 
 import hashlib
 
-from docx.image import Image
+from docx.image import Image_OLD
 from docx.opc.package import Part
 from docx.shared import Emu, Inches
 
@@ -70,7 +70,7 @@ def from_image(cls, image, partname):
     @property
     def image(self):
         if self._image is None:
-            self._image = Image.from_blob(self.blob)
+            self._image = Image_OLD.from_blob(self.blob)
         return self._image
 
     @classmethod
diff --git a/tests/image/test_image.py b/tests/image/test_image.py
@@ -8,38 +8,38 @@
 
 import pytest
 
-from docx.image import Image
+from docx.image import Image_OLD
 from docx.opc.constants import CONTENT_TYPE as CT
 
 from ..unitutil import test_file
 
 
-class DescribeImage(object):
+class DescribeImage_OLD(object):
 
     def it_can_construct_from_an_image_path(self):
         image_file_path = test_file('monty-truth.png')
-        image = Image.from_file(image_file_path)
-        assert isinstance(image, Image)
+        image = Image_OLD.from_file(image_file_path)
+        assert isinstance(image, Image_OLD)
         assert image.sha1 == '79769f1e202add2e963158b532e36c2c0f76a70c'
         assert image.filename == 'monty-truth.png'
 
     def it_can_construct_from_an_image_stream(self):
         image_file_path = test_file('monty-truth.png')
         with open(image_file_path, 'rb') as image_file_stream:
-            image = Image.from_file(image_file_stream)
-        assert isinstance(image, Image)
+            image = Image_OLD.from_file(image_file_stream)
+        assert isinstance(image, Image_OLD)
         assert image.sha1 == '79769f1e202add2e963158b532e36c2c0f76a70c'
         assert image.filename == 'image.png'
 
     def it_knows_the_extension_of_a_file_based_image(self):
         image_file_path = test_file('monty-truth.png')
-        image = Image.from_file(image_file_path)
+        image = Image_OLD.from_file(image_file_path)
         assert image.ext == '.png'
 
     def it_knows_the_extension_of_a_stream_based_image(self):
         image_file_path = test_file('monty-truth.png')
         with open(image_file_path, 'rb') as image_file_stream:
-            image = Image.from_file(image_file_stream)
+            image = Image_OLD.from_file(image_file_stream)
         assert image.ext == '.png'
 
     def it_correctly_characterizes_a_few_known_images(
@@ -49,7 +49,7 @@ def it_correctly_characterizes_a_few_known_images(
             characteristics
         )
         with open(test_file(image_path), 'rb') as stream:
-            image = Image.from_file(stream)
+            image = Image_OLD.from_file(stream)
             assert image.ext == ext
             assert image.content_type == content_type
             assert image.px_width == px_width
diff --git a/tests/parts/test_image.py b/tests/parts/test_image.py
@@ -8,7 +8,7 @@
 
 import pytest
 
-from docx.image import Image
+from docx.image import Image_OLD
 from docx.opc.constants import CONTENT_TYPE as CT, RELATIONSHIP_TYPE as RT
 from docx.opc.package import PartFactory
 from docx.opc.packuri import PackURI
@@ -68,7 +68,7 @@ def blob_(self, request):
     @pytest.fixture(params=['loaded', 'new'])
     def dimensions_fixture(self, request):
         image_file_path = test_file('monty-truth.png')
-        image = Image.from_file(image_file_path)
+        image = Image_OLD.from_file(image_file_path)
         expected_cx, expected_cy = 1905000, 2717800
 
         # case 1: image part is loaded by PartFactory w/no Image inst
@@ -102,7 +102,7 @@ def from_image_fixture(self, image_, partname_, ImagePart__init__):
 
     @pytest.fixture
     def image_(self, request):
-        return instance_mock(request, Image)
+        return instance_mock(request, Image_OLD)
 
     @pytest.fixture
     def ImagePart__init__(self, request):
diff --git a/tests/test_package.py b/tests/test_package.py
@@ -10,7 +10,7 @@
 
 from docx.opc.packuri import PackURI
 from docx.package import ImageParts, Package
-from docx.parts.image import Image, ImagePart
+from docx.parts.image import Image_OLD, ImagePart
 
 from .unitutil import (
     docx_path, class_mock, instance_mock, method_mock
@@ -81,13 +81,13 @@ def get_image_part_fixture(self, Image_, image_part_, image_descriptor_):
 
     @pytest.fixture
     def Image_(self, request, image_):
-        Image_ = class_mock(request, 'docx.package.Image')
+        Image_ = class_mock(request, 'docx.package.Image_OLD')
         Image_.from_file.return_value = image_
         return Image_
 
     @pytest.fixture
     def image_(self, request, sha1):
-        image_ = instance_mock(request, Image)
+        image_ = instance_mock(request, Image_OLD)
         image_.sha1 = sha1
         return image_
 
