Commit 04ecc262 authored by Tim Graham's avatar Tim Graham
Browse files

Removed SimpleLazyObject workaround for a Python 3 bug. 

The workaround added in fe8484ef
seems unnecessary as the Python bug is fixed in Python 3.4.
parent 2b6344e9

django/utils/functional.py

+1 −5
Original line number Diff line number Diff line
@@ -316,10 +316,6 @@ def unpickle_lazyobject(wrapped): 
    return wrapped





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

_super = super





class SimpleLazyObject(LazyObject):

    """

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

        """

        self.__dict__['_setupfunc'] = func

        _super(SimpleLazyObject, self).__init__()

        super(SimpleLazyObject, self).__init__()



    def _setup(self):

        self._wrapped = self._setupfunc()