diff options
| author | Tim Graham <timograham@gmail.com> | 2015-10-05 08:25:49 -0400 |
|---|---|---|
| committer | Tim Graham <timograham@gmail.com> | 2015-10-05 08:48:14 -0400 |
| commit | 4b95f1b0fba1fd9f184de247f96703e664f7f77c (patch) | |
| tree | 858f49ae586ecc0bb68d6ab57850f6133aea453f | |
| parent | 9b91c7d99d84d0eb4931d03a3bd98ceb502fa4a6 (diff) | |
[1.9.x] Removed SimpleLazyObject workaround for a Python bug.
Backport of 4accffd8fdaa59597dc40b47be031e7116c5b2a5 from master
| -rw-r--r-- | django/utils/functional.py | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/django/utils/functional.py b/django/utils/functional.py index c487cd8517..3df8c2f5c8 100644 --- a/django/utils/functional.py +++ b/django/utils/functional.py @@ -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() |