From 6eb3c1418f720c9c723c0b735c8cb3671bf5961f Mon Sep 17 00:00:00 2001
From: Adrian Holovaty <adrian@holovaty.com>
Date: Sun, 22 Jan 2006 06:00:27 +0000
Subject: [PATCH] magic-removal: Renamed 'type' variable to 'model' in
 ManipulatorDescriptor to be more readable

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2102 bcc190cf-cafb-0310-a4f2-bffc1f526a37
---
 django/db/models/manipulators.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/django/db/models/manipulators.py b/django/db/models/manipulators.py
index 65ba917f6d..22ed5259ff 100644
--- a/django/db/models/manipulators.py
+++ b/django/db/models/manipulators.py
@@ -21,7 +21,7 @@ class ManipulatorDescriptor(object):
         self.name = name
         self.base = base
 
-    def __get__(self, instance, type_=None):
+    def __get__(self, instance, model=None):
         if instance != None:
             raise "Manipulator cannot be accessed via instance"
         else:
@@ -30,10 +30,10 @@ class ManipulatorDescriptor(object):
                 # given in the model class (if specified) and the automatic
                 # manipulator.
                 bases = [self.base]
-                if hasattr(type_, 'Manipulator'):
-                    bases = [type_.Manipulator] + bases
+                if hasattr(model, 'Manipulator'):
+                    bases = [model.Manipulator] + bases
                 self.man = types.ClassType(self.name, tuple(bases), {})
-                self.man._prepare(type_)
+                self.man._prepare(model)
             return self.man
 
 class Naming(object):