Changeset 4156

Timestamp:

02/28/08 19:39:25 (9 months ago)

Author:

faide

Message:

Apply Jorge Godoy's patch against our custom FieldStorageConvertor? to allow the field to be optional.
Fixes ticket #1705

Files:

• branches/1.1/turbogears/validators.py (modified) (2 diffs)

branches/1.1/turbogears/validators.py

@@ -21 +21 @@
-
-from formencode import validators # to disambiguate the Number validator...
+
+# this import is needed for our custom FieldStorageUploadConverter
+import cgi
-
-def _(s): return s # dummy
@@ -134 +137 @@
-            return value
-
+# see #1464357 on FE bugtracker (http://tinyurl.com/lm9ae).
+# Custom version of FieldStorage validator that does not break FE schema validator.
+class FieldStorageUploadConverter(TgFancyValidator):
+    def __init__(self, *args, **kwargs):
+        super(TgFancyValidator, self).__init__(*args, **kwargs)
+        self.not_empty = kwargs.get('not_empty')
+
+    def _to_python(self, value, state=None):
+        if isinstance(value, cgi.FieldStorage):
+            if value.filename:
+                return value
+            if self.not_empty:
+                raise Invalid('invalid', value, state)
+        return value
-
-# For translated messages that are not wrapped in a Validator.messages