Ticket #6302: pass_initial_through_messy_example.diff

django/db/models/fields/__init__.py

@@ -13 +13 @@
-from django.core import validators
-from django import oldforms
-from django import newforms as forms
+from django.newforms.utils import InitialData
-from django.core.exceptions import ObjectDoesNotExist
-from django.utils.functional import curry
-from django.utils.itercompat import tee
@@ -795 +796 @@
-        return os.path.normpath(f)
-
-    def save_form_data(self, instance, data):
-
+ and not isinstance(data, InitialData)
-            getattr(instance, "save_%s_file" % self.name)(data.filename, data.content, save=False)
-
-    def formfield(self, **kwargs):

django/newforms/util.py

@@ -67 +67 @@
-        # AttributeError: ValidationError instance has no attribute 'args'
-        # See http://www.python.org/doc/current/tut/node10.html#handling
-        return repr(self.messages)
+
+class InitialData(object):
+
+    value = None
+
+    def __init__(self, value):
+        self.value = value

django/newforms/fields.py

@@ -19 +19 @@
-from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import StrAndUnicode, smart_unicode, smart_str
-
-
+, InitialData
-from widgets import TextInput, PasswordInput, HiddenInput, MultipleHiddenInput, FileInput, CheckboxInput, Select, NullBooleanSelect, SelectMultiple, DateTimeInput
-
-
@@ -441 +441 @@
-        super(FileField, self).clean(data)
-        if not self.required and data in EMPTY_VALUES:
-            return None
+        elif self.required and isinstance(data, InitialData):
+            return data 
-        try:
-            f = UploadedFile(data['filename'], data['content'])
-        except TypeError:

django/newforms/forms.py

@@ -9 +9 @@
-from django.utils.encoding import StrAndUnicode, smart_unicode, force_unicode
-from django.utils.safestring import mark_safe
-
-
+, EMPTY_VALUES
-from widgets import Media, media_property, TextInput, Textarea
-from util import flatatt, ErrorDict, ErrorList, ValidationError
-
@@ -204 +204 @@
-            # Each widget type knows how to retrieve its own data, because some
-            # widgets split data over several HTML fields.
-            value = field.widget.value_from_datadict(self.data, self.files, self.add_prefix(name))
+            if value in EMPTY_VALUES:
+                value = field.widget.value_from_initial(self.initial, name, value)
-            try:
-                value = field.clean(value)
-                self.cleaned_data[name] = value

django/newforms/widgets.py

@@ -15 +15 @@
-from django.utils.translation import ugettext
-from django.utils.encoding import StrAndUnicode, force_unicode
-from django.utils.safestring import mark_safe
-
+, InitialData
-from urlparse import urljoin
-
-__all__ = (
@@ -202 +202 @@
-            final_attrs['value'] = force_unicode(value)
-        return mark_safe(u'<input%s />' % flatatt(final_attrs))
-
+    def value_from_initial(self, initial, name, data):
+        return data
+
-class TextInput(Input):
-    input_type = 'text'
-
@@ -253 +256 @@
-        "File widgets take data from FILES, not POST"
-        return files.get(name, None)
-
+    def value_from_initial(self, initial, name, data):
+        if initial.has_key(name):
+            return InitialData(initial.get(name))
+        else:
+            return data
+
-class Textarea(Widget):
-    def __init__(self, attrs=None):
-        # The 'rows' and 'cols' attributes are required for HTML correctness.