MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@2809 bcc190cf-cafb-0310-a4f2-bffc1f526a37

1 files changed, 8 insertions, 8 deletions

diff --git a/django/utils/functional.py b/django/utils/functional.py
index 69aeb81850..d1514d5728 100644
--- a/django/utils/functional.py
+++ b/django/utils/functional.py
@@ -24,14 +24,14 @@ def lazy(func, *resultclasses):
         # the evaluation and store the result. Afterwards, the result
         # is delivered directly. So the result is memoized.
         def __init__(self, args, kw):
-           self.__func = func
-           self.__args = args
-           self.__kw = kw
-           self.__dispatch = {}
-           for resultclass in resultclasses:
-               self.__dispatch[resultclass] = {}
-               for (k, v) in resultclass.__dict__.items():
-                   setattr(self, k, self.__promise__(resultclass, k, v))
+            self.__func = func
+            self.__args = args
+            self.__kw = kw
+            self.__dispatch = {}
+            for resultclass in resultclasses:
+                self.__dispatch[resultclass] = {}
+                for (k, v) in resultclass.__dict__.items():
+                    setattr(self, k, self.__promise__(resultclass, k, v))
 
         def __promise__(self, klass, funcname, func):
             # Builds a wrapper around some magic method and registers that magic