Ticket #2535: manipulator_validators.diff

Users/korpios/checkouts/django/trunk/django/db/models/fields/__init__.py

@@ -7 +7 @@
 from django.utils.functional import curry
 from django.utils.text import capfirst
 from django.utils.translation import gettext, gettext_lazy
-import datetime, os, time
+import datetime, os, time, inspect
 
 class NOT_PROVIDED:
     pass
@@ -225 +225 @@
         """
         field_objs, params = self.prepare_field_objs_and_params(manipulator, name_prefix)
 
+        # Curry validators that require the manipulator passed in.
+        for i, validator in enumerate(params['validator_list']):
+            assert callable(validator), "Validator not callable: %r" % validator
+            if inspect.isfunction(validator):
+                wrap = len(inspect.getargspec(validator)[0]) == 3
+            elif inspect.ismethod(validator):
+                wrap = len(inspect.getargspec(validator)[0]) == 4
+            else:
+                wrap = len(inspect.getargspec(validator.__call__)[0]) == 4
+            if wrap:                
+                params['validator_list'][i] = curry(validator, manipulator)
+
         # Add the "unique" validator(s).
         for field_name_list in opts.unique_together:
             if field_name_list[0] == self.name: