Fix misleading reprs for property and associated image maps

Author: bgilbert

openslide/__init__.py

@@ -228,7 +228,7 @@ def __init__(self, osr):
         self._osr = osr
 
     def __repr__(self):
-        return repr(dict(self))
+        return '<%s %r>' % (self.__class__.__name__, dict(self))
 
     def __len__(self):
         return len(self._keys())

tests/test_openslide.py

@@ -20,6 +20,7 @@
 from ctypes import ArgumentError
 from openslide import (OpenSlide, OpenSlideError,
         OpenSlideUnsupportedFormatError)
+import re
 import unittest
 
 from . import file_path
@@ -100,6 +101,8 @@ def test_properties(self):
         # test __len__ and __iter__
         self.assertEqual(len([v for v in self.osr.properties]),
                 len(self.osr.properties))
+        self.assertEqual(repr(self.osr.properties),
+                '<_PropertyMap %r>' % dict(self.osr.properties))
 
     def test_read_region(self):
         self.assertEqual(self.osr.read_region((-10, -10), 1, (400, 400)).size,
@@ -132,6 +135,11 @@ def test_associated_images(self):
         # test __len__ and __iter__
         self.assertEqual(len([v for v in self.osr.associated_images]),
                 len(self.osr.associated_images))
+        def mangle_repr(o):
+            return re.sub('0x[0-9a-fA-F]+', '(mangled)', repr(o))
+        self.assertEqual(mangle_repr(self.osr.associated_images),
+                '<_AssociatedImageMap %s>' % mangle_repr(
+                dict(self.osr.associated_images)))
 
 
 class TestUnreadableSlide(_SlideTest, unittest.TestCase):