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

Removed SimpleLazyObject workaround for a Python 3 bug. 

The workaround added in fe8484efda
seems unnecessary as the Python bug is fixed in Python 3.4.
This commit is contained in:
Tim Graham 2015-10-05 08:25:49 -04:00
parent 2b6344e944
commit 04ecc26223
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

@ -316,10 +316,6 @@ def unpickle_lazyobject(wrapped):
return wrapped return wrapped
# 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.
@ -337,7 +333,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()