Merge pull request #266 from dahlia/empty-image-repr

Fix repr() for empty images

docs/changes.rst

@@ -7,7 +7,8 @@ Wand Changelog
 Version 0.4.3
 -------------
 
-To be released.
+- Fixed :func:`repr()` for empty :class:`~.wand.image.Image` objects.
+  [:issue:`265`]
 
 
 Version 0.4.2

tests/image_test.py

@@ -37,6 +37,7 @@
 def test_empty_image():
     with Image() as img:
         assert img.size == (0, 0)
+        assert repr(img) == '<wand.image.Image: (empty)>'
 
 
 def test_image_invalid_params():

tox.ini

@@ -1,5 +1,5 @@
 [tox]
-envlist = py26, py27, py32, py33, py34, py35, pypy
+envlist = py26, py27, py32, py33, py34, py35, pypy, pypy3
 
 [testenv]
 deps =

wand/image.py

@@ -2362,13 +2362,19 @@ def transform_colorspace(self, colorspace_type):
         if not r:
             self.raise_exception()
 
-    def __repr__(self):
+    def __repr__(self, extra_format=' ({self.width}x{self.height})'):
         cls = type(self)
+        typename = '{0}.{1}'.format(
+            cls.__module__,
+            getattr(cls, '__qualname__', cls.__name__)
+        )
         if getattr(self, 'c_resource', None) is None:
-            return '<{0}.{1}: (closed)>'.format(cls.__module__, cls.__name__)
-        return '<{0}.{1}: {2} ({3}x{4})>'.format(
-            cls.__module__, cls.__name__,
-            self.signature[:7], self.width, self.height
+            return '<{0}: (closed)>'.format(typename)
+        sig = self.signature
+        if not sig:
+            return '<{0}: (empty)>'.format(typename)
+        return '<{0}: {1}{2}>'.format(
+            typename, sig[:7], extra_format.format(self=self)
         )
 
 
@@ -3154,12 +3160,8 @@ def _repr_png_(self):
             return cloned.make_blob()
 
     def __repr__(self):
-        cls = type(self)
-        if getattr(self, 'c_resource', None) is None:
-            return '<{0}.{1}: (closed)>'.format(cls.__module__, cls.__name__)
-        return '<{0}.{1}: {2} {3!r} ({4}x{5})>'.format(
-            cls.__module__, cls.__name__,
-            self.signature[:7], self.format, self.width, self.height
+        return super(Image, self).__repr__(
+            extra_format=' {self.format!r} ({self.width}x{self.height})'
         )