Ticket #5894: diff.9.diff

django/db/models/fields/__init__.py

@@ -814 +814 @@
-        self.path, self.match, self.recursive = path, match, recursive
-        kwargs['max_length'] = kwargs.get('max_length', 100)
-        Field.__init__(self, verbose_name, name, **kwargs)
+    
+    def formfield(self, **kwargs):
+        defaults = {
+            'path': self.path,
+            'match': self.match,
+            'recursive': self.recursive,
+            'form_class': forms.FilePathField,
+        }
+        defaults.update(kwargs)
+        return super(FilePathField, self).formfield(**defaults)
-
-    def get_manipulator_field_objs(self):
-        return [curry(oldforms.FilePathField, path=self.path, match=self.match, recursive=self.recursive)]

django/newforms/fields.py

@@ -4 +4 @@
-
-import copy
-import datetime
+import os
-import re
-import time
-# Python 2.3 fallbacks
@@ -31 +32 @@
-    'RegexField', 'EmailField', 'FileField', 'ImageField', 'URLField',
-    'BooleanField', 'NullBooleanField', 'ChoiceField', 'MultipleChoiceField',
-    'ComboField', 'MultiValueField', 'FloatField', 'DecimalField',
-
+ 'FilePathField',
-)
-
-# These values, if given to to_python(), will trigger the self.required check.
@@ -479 +480 @@
-            raise ValidationError(self.error_messages['invalid_image'])
-        return f
-
+class FilePathField(ChoiceField):
+    def __init__(self, path, match=None, recursive=False, required=True,
+                 widget=Select, label=None, initial=None, help_text=None,
+                 *args, **kwargs):
+        self.path, self.match, self.recursive = path, match, recursive
+        super(FilePathField, self).__init__(choices=(), required=required,
+            widget=widget, label=label, initial=initial, help_text=help_text,
+            *args, **kwargs)
+        self.choices = []
+        if self.match is not None:
+            self.match_re = re.compile(self.match)
+        if recursive:
+            for root, dirs, files in os.walk(self.path):
+                for f in files:
+                    if self.match is None or self.match_re.search(f):
+                        f = os.path.join(root, f)
+                        self.choices.append(f, f.replace(self.path, "", 1))
+        else:
+            try:
+                for f in os.listdir(self.path):
+                    full_file = os.path.join(self.path, f)
+                    if os.path.isfile(full_file) and (self.match is None or self.match_re.search(f)):
+                        self.choices.append((full_file, f))
+            except OSError:
+                pass
+        self.widget.choices = self.choices
+
-url_re = re.compile(
-    r'^https?://' # http:// or https://
-    r'(?:(?:[A-Z0-9-]+\.)+[A-Z]{2,6}|' #domain...

tests/regressiontests/forms/fields.py

@@ -1106 +1106 @@
->>> f.clean(None)
-u''
-
+# FilePathField ###############################################################
+
+>>> import re
+>>> from django import newforms as forms
+>>> loc = forms.__file__
+>>> m = re.search(r'(.*?)/__init__\..*$', loc)
+>>> loc = m.group(1) + '/'
+>>> loc
+'.../django/newforms/'
+>>> f = forms.FilePathField(path=loc)
+>>> f.choices.sort()
+>>> f.choices
+[('.../django/newforms/__init__.py', '__init__.py'), ('.../django/newforms/__init__.pyc', '__init__.pyc'), ('.../django/newforms/fields.py', 'fields.py'), ('.../django/newforms/fields.pyc', 'fields.pyc'), ('.../django/newforms/fields.py~', 'fields.py~'), ('.../django/newforms/forms.py', 'forms.py'), ('.../django/newforms/forms.pyc', 'forms.pyc'), ('.../django/newforms/models.py', 'models.py'), ('.../django/newforms/models.pyc', 'models.pyc'), ('.../django/newforms/util.py', 'util.py'), ('.../django/newforms/util.pyc', 'util.pyc'), ('.../django/newforms/widgets.py', 'widgets.py'), ('.../django/newforms/widgets.pyc', 'widgets.pyc')]
+>>> f.clean('fields.py')
+Traceback (most recent call last):
+...
+ValidationError: [u'Select a valid choice. That choice is not one of the available choices.']
+>>> f.clean(loc+'fields.py')
+u'.../django/newforms/fields.py'
+
-# SplitDateTimeField ##########################################################
-
->>> f = SplitDateTimeField()

docs/newforms.txt

@@ -1345 +1345 @@
-
-.. _`bind the file data to the form`: `Binding uploaded files to a form`_
-
+``FilePathField``
+~~~~~~~~~~~~~~
+
+**New in Django development version**
+
+    * Default widget: ``Select``
+    * Empty value: ``None``
+    * Normalizes to: A unicode object
+    * Validates that the selected choice exists in the list of choices.
+    * Error message keys: ``required``, ``invalid_choice``
+
+The choices are generated from the filesystem.  They can be forced to match a specific regulat expression(this only matches the file, not the entire path).  It can also be recursive.
+
-``ImageField``
-~~~~~~~~~~~~~~
-