magic-removal: Fixed bug in Field.get_validator_unique_lookup_type. Also, negligible spacing/formatting changes

git-svn-id: http://code.djangoproject.com/svn/django/branches/magic-removal@1827 bcc190cf-cafb-0310-a4f2-bffc1f526a37

django/db/models/fields/__init__.py

@@ -218,7 +218,7 @@ class Field(object):
             field_objs = self.get_manipulator_field_objs()
         return (field_objs,params)
 
-    def get_fields_and_manipulators(self, opts, manipulator, follow ):
+    def get_fields_and_manipulators(self, opts, manipulator, follow):
         change = manipulator.change
         rel = manipulator.name_prefix != ''
         name_prefix = manipulator.name_prefix
@@ -276,7 +276,7 @@ class Field(object):
         return [man(field_name=field_names[i], **params) for i, man in enumerate(field_objs)]
 
     def get_validator_unique_lookup_type(self):
-        return '%s__exact' % f.name
+        return '%s__exact' % self.name
 
     def get_manipulator_new_data(self, new_data, rel=False):
         """

django/db/models/manipulators.py

@@ -2,13 +2,11 @@ from django.core.exceptions import ObjectDoesNotExist
 from django.core import formfields
 from django.core.formfields import Manipulator
 from django.db.models.fields import FileField, AutoField
-
 from django.db.models.exceptions import BadCommand
 from django.dispatch import dispatcher
 from django.db.models import signals
 from django.utils.functional import curry
 from django.utils.datastructures import dot_expand, MultiValueDict
-
 import types
 
 def add_manipulators(sender):
@@ -34,7 +32,7 @@ class ManipulatorDescriptor(object):
             if not self.man:
                 # Create a class which inherits from the MANIPULATOR class given in the class,
                 # and the appropriate automatic manipulator,
-                bases = [ self.base ]
+                bases = [self.base]
                 if hasattr(type, 'MANIPULATOR'):
                     bases = [type.MANIPULATOR] + bases
                 self.man = types.ClassType(self.name, tuple(bases), {})

django/db/models/related.py

@@ -96,13 +96,12 @@ class RelatedObject(object):
     def __repr__(self):
         return "<RelatedObject: %s related to %s>" % (self.name, self.field.name)
 
-    def get_fields_and_manipulators(self, opts, manipulator, follow ):
-        return ([], self.get_manipulators(manipulator, follow)  )
+    def get_fields_and_manipulators(self, opts, manipulator, follow):
+        return ([], self.get_manipulators(manipulator, follow))
 
-    def get_manipulators(self,parent_manipulator, follow):
+    def get_manipulators(self, parent_manipulator, follow):
         name_parts = parent_manipulator.name_parts
         obj = parent_manipulator.original_object
-        
         return RelatedManipulatorCollection(self, name_parts, obj, follow)
 
     def bind(self, field_mapping, original, bound_related_object_class=BoundRelatedObject):