newforms-admin: Merged from trunk up to [6952].

git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@6955 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 27 insertions, 24 deletions

diff --git a/django/newforms/fields.py b/django/newforms/fields.py
index 58f65ffde5..3b8f4195b0 100644
--- a/django/newforms/fields.py
+++ b/django/newforms/fields.py
@@ -533,8 +533,8 @@ class BooleanField(Field):
         """Returns a Python boolean object."""
         super(BooleanField, self).clean(value)
         # Explicitly check for the string 'False', which is what a hidden field
-        # will submit for False (since bool("True") == True we don't need to
-        # handle that explicitly).
+        # will submit for False. Because bool("True") == True, we don't need to
+        # handle that explicitly.
         if value == 'False':
             return False
         return bool(value)
diff --git a/django/newforms/models.py b/django/newforms/models.py
index 3c9b43da20..e0f2cde5d4 100644
--- a/django/newforms/models.py
+++ b/django/newforms/models.py
@@ -86,9 +86,8 @@ def form_for_model(model, form=BaseForm, fields=None,
     determining the formfield for a given database field. It's a callable that
     takes a database Field instance and returns a form Field instance.
     """
-    warn("form_for_model is deprecated, use ModelForm instead.",
-        PendingDeprecationWarning,
-        stacklevel=3)
+    warn("form_for_model is deprecated. Use ModelForm instead.",
+        PendingDeprecationWarning, stacklevel=3)
     opts = model._meta
     field_list = []
     for f in opts.fields + opts.many_to_many:
@@ -116,9 +115,8 @@ def form_for_instance(instance, form=BaseForm, fields=None,
     takes a database Field instance, plus **kwargs, and returns a form Field
     instance with the given kwargs (i.e. 'initial').
     """
-    warn("form_for_instance is deprecated, use ModelForm instead.",
-        PendingDeprecationWarning,
-        stacklevel=3)
+    warn("form_for_instance is deprecated. Use ModelForm instead.",
+        PendingDeprecationWarning, stacklevel=3)
     model = instance.__class__
     opts = model._meta
     field_list = []
@@ -151,10 +149,10 @@ def model_to_dict(instance, fields=None, exclude=None):
     """
     Returns a dict containing the data in ``instance`` suitable for passing as
     a Form's ``initial`` keyword argument.
-    
+
     ``fields`` is an optional list of field names. If provided, only the named
     fields will be included in the returned dict.
-    
+
     ``exclude`` is an optional list of field names. If provided, the named
     fields will be excluded from the returned dict, even if they are listed in
     the ``fields`` argument.
@@ -189,7 +187,7 @@ def fields_for_model(model, fields=None, exclude=None, formfield_callback=lambda
 
     ``fields`` is an optional list of field names. If provided, only the named
     fields will be included in the returned fields.
-    
+
     ``exclude`` is an optional list of field names. If provided, the named
     fields will be excluded from the returned fields, even if they are listed
     in the ``fields`` argument.
@@ -216,9 +214,8 @@ class ModelFormOptions(object):
         self.exclude = getattr(options, 'exclude', None)
 
 class ModelFormMetaclass(type):
-    def __new__(cls, name, bases, attrs):
-        # TODO: no way to specify formfield_callback yet, do we need one, or
-        # should it be a special case for the admin?
+    def __new__(cls, name, bases, attrs,
+                formfield_callback=lambda f: f.formfield()):
         fields = [(field_name, attrs.pop(field_name)) for field_name, obj in attrs.items() if isinstance(obj, Field)]
         fields.sort(lambda x, y: cmp(x[1].creation_counter, y[1].creation_counter))
 
@@ -247,15 +244,16 @@ class ModelFormMetaclass(type):
 
         # If a model is defined, extract form fields from it and add them to base_fields
         if attrs['_meta'].model is not None:
-            # Don't allow a subclass to define a Meta model if a parent class has.
-            # Technically the right fields would be generated, but the save 
-            # method will not deal with more than one model.
+            # Don't allow a subclass to define a different Meta model than a
+            # parent class has. Technically the right fields would be generated,
+            # but the save method will not deal with more than one model.
             for base in bases:
                 base_opts = getattr(base, '_meta', None)
                 base_model = getattr(base_opts, 'model', None)
-                if base_model is not None:
-                    raise ImproperlyConfigured('%s defines more than one model.' % name)
-            model_fields = fields_for_model(opts.model, opts.fields, opts.exclude)
+                if base_model and base_model is not opts.model:
+                    raise ImproperlyConfigured('%s defines a different model than its parent.' % name)
+            model_fields = fields_for_model(opts.model, opts.fields,
+                    opts.exclude, formfield_callback)
             # fields declared in base classes override fields from the model
             model_fields.update(declared_fields)
             attrs['base_fields'] = model_fields
@@ -264,11 +262,16 @@ class ModelFormMetaclass(type):
         return type.__new__(cls, name, bases, attrs)
 
 class BaseModelForm(BaseForm):
-    def __init__(self, instance, data=None, files=None, auto_id='id_%s', prefix=None,
-                 initial=None, error_class=ErrorList, label_suffix=':'):
-        self.instance = instance
+    def __init__(self, data=None, files=None, auto_id='id_%s', prefix=None,
+                 initial=None, error_class=ErrorList, label_suffix=':', instance=None):
         opts = self._meta
-        object_data = model_to_dict(instance, opts.fields, opts.exclude)
+        if instance is None:
+            # if we didn't get an instance, instantiate a new one
+            self.instance = opts.model()
+            object_data = {}
+        else:
+            self.instance = instance
+            object_data = model_to_dict(instance, opts.fields, opts.exclude)
         # if initial was provided, it should override the values from instance
         if initial is not None:
             object_data.update(initial)