Commit 4b95f1b0 authored by Tim Graham's avatar Tim Graham
Browse files

[1.9.x] Removed SimpleLazyObject workaround for a Python bug. 

Backport of 4accffd8fdaa59597dc40b47be031e7116c5b2a5 from master
parent 9b91c7d9

django/utils/functional.py

+1 −5
Original line number Diff line number Diff line
@@ -317,10 +317,6 @@ def unpickle_lazyobject(wrapped): 
unpickle_lazyobject.__safe_for_unpickling__ = True





# Workaround for http://bugs.python.org/issue12370

_super = super





class SimpleLazyObject(LazyObject):

    """

    A lazy object initialized from any function.
@@ -338,7 +334,7 @@ class SimpleLazyObject(LazyObject): 
        value.

        """

        self.__dict__['_setupfunc'] = func

        _super(SimpleLazyObject, self).__init__()

        super(SimpleLazyObject, self).__init__()



    def _setup(self):

        self._wrapped = self._setupfunc()