Merge pull request faif#243 from eclectic-boy/patch-1

Allow delegator to return delegate's properties

Author: faif

fundamental/delegation_pattern.py

@@ -13,26 +13,38 @@
 class Delegator(object):
     """
     >>> delegator = Delegator(Delegate())
+    >>> delegator.p1
+    123
+    >>> delegator.p2
+    Traceback (most recent call last):
+    ...
+    AttributeError: 'Delegate' object has no attribute 'p2'
     >>> delegator.do_something("nothing")
     'Doing nothing'
     >>> delegator.do_anything()
-
+    Traceback (most recent call last):
+    ...
+    AttributeError: 'Delegate' object has no attribute 'do_anything'
     """
 
     def __init__(self, delegate):
         self.delegate = delegate
 
     def __getattr__(self, name):
-        def wrapper(*args, **kwargs):
-            if hasattr(self.delegate, name):
-                attr = getattr(self.delegate, name)
-                if callable(attr):
-                    return attr(*args, **kwargs)
+        attr = getattr(self.delegate, name)
+        
+        if not callable(attr):
+            return attr
 
+        def wrapper(*args, **kwargs):
+            return attr(*args, **kwargs)
         return wrapper
 
 
 class Delegate(object):
+    def __init__(self):
+        self.p1 = 123
+
     def do_something(self, something):
         return "Doing %s" % something