Merge branch 'master' of github.com:mahmoud/boltons

mahmoud · Feb 26, 2017 · 16e082f · 16e082f
2 parents 5660942 + 9a82371
commit 16e082f
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/boltons/urlutils.py b/boltons/urlutils.py
@@ -232,15 +232,14 @@ class cachedproperty(object):
     allows the cache to be cleared with :func:`delattr`, or through
     manipulating the object's ``__dict__``.
     """
-
     def __init__(self, func):
+        self.__doc__ = getattr(func, '__doc__')
         self.func = func
 
     def __get__(self, obj, objtype=None):
         if obj is None:
             return self
-        value = self.func(obj)
-        setattr(obj, self.func.__name__, value)
+        value = obj.__dict__[self.func.__name__] = self.func(obj)
         return value
 
     def __repr__(self):