Doctest Adapter

Author: gyermolenko

patterns/structural/adapter.py

@@ -70,71 +70,53 @@ class Adapter(object):
     Usage:
     dog = Dog()
     dog = Adapter(dog, make_noise=dog.bark)
+    """
+
+    def __init__(self, obj, **adapted_methods):
+        """We set the adapted methods in the object's dict"""
+        self.obj = obj
+        self.__dict__.update(adapted_methods)
+
+    def __getattr__(self, attr):
+        """All non-adapted calls are passed to the object"""
+        return getattr(self.obj, attr)
 
+    def original_dict(self):
+        """Print original object dict"""
+        return self.obj.__dict__
+
+
+def main():
+    """
     >>> objects = []
     >>> dog = Dog()
     >>> print(dog.__dict__)
     {'name': 'Dog'}
+
     >>> objects.append(Adapter(dog, make_noise=dog.bark))
+
+    >>> objects[0].__dict__['obj'], objects[0].__dict__['make_noise']
+    (<...Dog object at 0x...>, <bound method Dog.bark of <...Dog object at 0x...>>)
+
     >>> print(objects[0].original_dict())
     {'name': 'Dog'}
+
     >>> cat = Cat()
     >>> objects.append(Adapter(cat, make_noise=cat.meow))
     >>> human = Human()
     >>> objects.append(Adapter(human, make_noise=human.speak))
     >>> car = Car()
-    >>> car_noise = lambda: car.make_noise(3)
-    >>> objects.append(Adapter(car, make_noise=car_noise))
+    >>> objects.append(Adapter(car, make_noise=lambda: car.make_noise(3)))
 
     >>> for obj in objects:
-    ...     print('A {} goes {}'.format(obj.name, obj.make_noise()))
+    ...    print("A {0} goes {1}".format(obj.name, obj.make_noise()))
     A Dog goes woof!
     A Cat goes meow!
     A Human goes 'hello'
     A Car goes vroom!!!
     """
 
-    def __init__(self, obj, **adapted_methods):
-        """We set the adapted methods in the object's dict"""
-        self.obj = obj
-        self.__dict__.update(adapted_methods)
-
-    def __getattr__(self, attr):
-        """All non-adapted calls are passed to the object"""
-        return getattr(self.obj, attr)
-
-    def original_dict(self):
-        """Print original object dict"""
-        return self.obj.__dict__
-
-
-def main():
-
-    objects = []
-    dog = Dog()
-    print(dog.__dict__)
-    objects.append(Adapter(dog, make_noise=dog.bark))
-    print(objects[0].__dict__)
-    print(objects[0].original_dict())
-    cat = Cat()
-    objects.append(Adapter(cat, make_noise=cat.meow))
-    human = Human()
-    objects.append(Adapter(human, make_noise=human.speak))
-    car = Car()
-    objects.append(Adapter(car, make_noise=lambda: car.make_noise(3)))
-
-    for obj in objects:
-        print("A {0} goes {1}".format(obj.name, obj.make_noise()))
-
 
 if __name__ == "__main__":
-    main()
-
-### OUTPUT ###
-# {'name': 'Dog'}
-# {'make_noise': <bound method Dog.bark of <__main__.Dog object at 0x7f631ba3fb00>>, 'obj': <__main__.Dog object at 0x7f631ba3fb00>}    # noqa flake8
-# {'name': 'Dog'}
-# A Dog goes woof!
-# A Cat goes meow!
-# A Human goes 'hello'
-# A Car goes vroom!!!
+    import doctest
+    doctest.testmod(optionflags=doctest.ELLIPSIS)