p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Backport of 4accffd8fdaa59597dc40b47be031e7116c5b2a5 from master
This commit is contained in:
Tim Graham 2015-10-05 08:25:49 -04:00
parent 9b91c7d99d
commit 4b95f1b0fb
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
django/utils/functional.py
View File

@ -317,10 +317,6 @@ def unpickle_lazyobject(wrapped):
unpickle_lazyobject.__safe_for_unpickling__ = True unpickle_lazyobject.__safe_for_unpickling__ = True
# Workaround for http://bugs.python.org/issue12370
_super = super
class SimpleLazyObject(LazyObject): class SimpleLazyObject(LazyObject):
""" """
A lazy object initialized from any function. A lazy object initialized from any function.
@ -338,7 +334,7 @@ class SimpleLazyObject(LazyObject):
value. value.
""" """
self.__dict__['_setupfunc'] = func self.__dict__['_setupfunc'] = func
_super(SimpleLazyObject, self).__init__() super(SimpleLazyObject, self).__init__()
def _setup(self): def _setup(self):
self._wrapped = self._setupfunc() self._wrapped = self._setupfunc()