From 387f453db548bba421bb3ad37a22ba473c949842 Mon Sep 17 00:00:00 2001 From: Adrian Holovaty Date: Sat, 21 Jan 2006 06:40:52 +0000 Subject: [PATCH] magic-removal: Changed inner-class name in models from MANIPULATOR to Manipulator git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@2096 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/manipulators.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/django/db/models/manipulators.py b/django/db/models/manipulators.py index 06f31d8dc7..d116763b08 100644 --- a/django/db/models/manipulators.py +++ b/django/db/models/manipulators.py @@ -26,11 +26,12 @@ class ManipulatorDescriptor(object): raise "Manipulator can not be accessed via instance" else: if not self.man: - # Create a class which inherits from the MANIPULATOR class given in the class, - # and the appropriate automatic manipulator, + # Create a class that inherits from the "Manipulator" class + # given in the model class (if specified) and the automatic + # manipulator. bases = [self.base] - if hasattr(type, 'MANIPULATOR'): - bases = [type.MANIPULATOR] + bases + if hasattr(type, 'Manipulator'): + bases = [type.Manipulator] + bases self.man = types.ClassType(self.name, tuple(bases), {}) self.man._prepare(type) return self.man