2 files changed, 17 insertions, 5 deletions
diff --git a/django/db/models/fields/__init__.py b/django/db/models/fields/__init__.py
index 8e8d68aad5..1927ad7535 100644
--- a/django/db/models/fields/__init__.py
+++ b/django/db/models/fields/__init__.py
@@ -333,6 +333,12 @@ class Field(object):
             return self._choices
     choices = property(_get_choices)
 
+    def formfield(self):
+        "Returns a django.newforms.Field instance for this database Field."
+        from django.newforms import CharField
+        # TODO: This is just a temporary default during development.
+        return CharField(label=capfirst(self.verbose_name))
+
 class AutoField(Field):
     empty_strings_allowed = False
     def __init__(self, *args, **kwargs):
diff --git a/django/newforms/models.py b/django/newforms/models.py
index d99619c44a..6c01969001 100644
--- a/django/newforms/models.py
+++ b/django/newforms/models.py
@@ -1,13 +1,19 @@
 """
-Helper functions for creating Forms from Django models and database field objects.
+Helper functions for creating Form classes from Django models
+and database field objects.
 """
 
+from forms import BaseForm, DeclarativeFieldsMetaclass, SortedDictFromList
+
 __all__ = ('form_for_model', 'form_for_fields')
 
 def form_for_model(model):
-    "Returns a Form instance for the given Django model class."
-    raise NotImplementedError
+    "Returns a Form class for the given Django model class."
+    opts = model._meta
+    fields = SortedDictFromList([(f.name, f.formfield()) for f in opts.fields + opts.many_to_many])
+    return type(opts.object_name + 'Form', (BaseForm,), {'fields': fields, '_model_opts': opts})
 
 def form_for_fields(field_list):
-    "Returns a Form instance for the given list of Django database field instances."
-    raise NotImplementedError
+    "Returns a Form class for the given list of Django database field instances."
+    fields = SortedDictFromList([(f.name, f.formfield()) for f in field_list])
+    return type('FormForFields', (BaseForm,), {'fields': fields})