From 04ecc26223e4c574067e827320a7f26a86477c88 Mon Sep 17 00:00:00 2001 From: Tim Graham Date: Mon, 5 Oct 2015 08:25:49 -0400 Subject: [PATCH] Removed SimpleLazyObject workaround for a Python 3 bug. The workaround added in fe8484efda257e151d9c1ca5151e546c9262bf0f seems unnecessary as the Python bug is fixed in Python 3.4. --- django/utils/functional.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/django/utils/functional.py b/django/utils/functional.py index 978d152be2..9738d20646 100644 --- a/django/utils/functional.py +++ b/django/utils/functional.py @@ -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()