Fix email extractor. Must not raise ExtractionError if not required o…

…n empty input.

HISTORY.rst

@@ -2,6 +2,14 @@
 History
 =======
 
+2.1.3 (unreleased)
+------------------
+
+- Fix email extractor. Must not raise ExtractionError if not required on empty
+  input.
+  [rnix, 2015-04-11]
+
+
 2.1.2 (2015-01-23)
 ------------------
 

setup.py

@@ -5,7 +5,7 @@
 )
 
 
-version = '2.1.2'
+version = '2.1.3.dev0'
 shortdesc = \
 'YAFOWIL - declarative, flexible html forms, framework independent.'
 longdesc = open(os.path.join(os.path.dirname(__file__), 'README.rst')).read()

src/yafowil/common.py

@@ -1439,7 +1439,9 @@ def submit_renderer(widget, data):
 
 def email_extractor(widget, data):
     val = data.extracted
-    if not re.match(EMAIL_RE, val is not UNSET and val or ''):
+    if not val:
+        return val
+    if not re.match(EMAIL_RE, val):
         message = _('email_address_not_valid',
                     default=u'Input not a valid email address.')
         raise ExtractionError(message)

src/yafowil/common.rst

@@ -2299,7 +2299,7 @@ Render empty (WHAT'S THIS GOOD FOR?)::
     <BLANKLINE>
 
 
-e-mail
+E-Mail
 ------
 
 ::
@@ -2310,6 +2310,10 @@ e-mail
     >>> pxml(widget())
     <input class="email" id="input-email" name="email" type="email" value=""/>
 
+    >>> data = widget.extract({'email': ''})
+    >>> data.errors
+    []
+
     >>> data = widget.extract({'email': 'foo@bar'})
     >>> data.errors
     [ExtractionError('Input not a valid email address.',)]
@@ -2322,6 +2326,19 @@ e-mail
     >>> data.errors
     []
 
+    >>> widget = factory(
+    ...     'email',
+    ...     name='email',
+    ...     props={'required': 'E-Mail Address is required'})
+
+    >>> data = widget.extract({'email': ''})
+    >>> data.errors
+    [ExtractionError('E-Mail Address is required',)]
+
+    >>> data = widget.extract({'email': 'foo@bar.com'})
+    >>> data.errors
+    []
+
 
 URL
 ---