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

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
This commit is contained in:
Adrian Holovaty 2006-01-22 06:00:27 +00:00
parent 6d9b4f443c
commit 6eb3c1418f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
django/db/models/manipulators.py
View File

@ -21,7 +21,7 @@ class ManipulatorDescriptor(object):
self.name = name self.name = name
self.base = base self.base = base
def __get__(self, instance, type_=None): def __get__(self, instance, model=None):
if instance != None: if instance != None:
raise "Manipulator cannot be accessed via instance" raise "Manipulator cannot be accessed via instance"
else: else:
@ -30,10 +30,10 @@ class ManipulatorDescriptor(object):
# given in the model class (if specified) and the automatic # given in the model class (if specified) and the automatic
# manipulator. # manipulator.
bases = [self.base] bases = [self.base]
if hasattr(type_, 'Manipulator'): if hasattr(model, 'Manipulator'):
bases = [type_.Manipulator] + bases bases = [model.Manipulator] + bases
self.man = types.ClassType(self.name, tuple(bases), {}) self.man = types.ClassType(self.name, tuple(bases), {})
self.man._prepare(type_) self.man._prepare(model)
return self.man return self.man
class Naming(object): class Naming(object):