Changeset 8169

Timestamp:

16 Apr 2012, 06:51:36 (12 years ago)

Author:

uli

Message:

Shorten code.

File:

• main/waeup.kofa/trunk/src/waeup/kofa/widgets/phonewidget.py (modified) (1 diff)

main/waeup.kofa/trunk/src/waeup/kofa/widgets/phonewidget.py

@@ -117 +117 @@
             raise ConversionError(
                 _("Empty phone field(s)."), MissingInputError(
-                self.name, self.label, None))
+                    self.name, self.label, None))
         if parts[0] != '' and not RE_INT_PREFIX.match(parts[0]):
             raise ConversionError(
                 _("Int. prefix requires format '+NNN'"),
                 ValueError('invalid international prefix'))
-        error1 = parts[1] != '' and not RE_NUMBERS.match(parts[1])
-        if len(parts) == 3:
-            error2 = parts[2] != '' and not RE_NUMBERS_AND_HYPHENS.match(parts[2])
-        else:
-            error2 = False
-        if error1 or error2:
+        # Make sure there are only numbers in parts 1..N. We do not allow
+        # dashes in last field any more.
+        errors = [(x != '' and not RE_NUMBERS.match(x)) for x in parts[1:]]
+        error = True in errors
+        if error:
             raise ConversionError(
                 _("Phone numbers may contain numbers only."),
                 ValueError('non numbers in phone number'))
-        # We consider also values ending with '--' as missing values.
-        # This means that any prefix setting in the form will switch
-        # back to default upon submit if no further phone fields are filled.
-        # As advantage we get only valid phone numbers or missing value.
-        if result in ('', None) or result.endswith('--'):
+        # We consider also values ending with empty ending as missing
+        # values.  An 'empty ending' is a form where the fields
+        # following the prefix are all empty.  This means that any
+        # prefix setting in the form will switch back to default upon
+        # submit if no further phone fields are filled.  As advantage
+        # we get only valid phone numbers or missing value.
+        empty_ending = '-'*(len(parts) - 1)
+        if result in ('', None) or result.endswith(empty_ending):
             result = self.context.missing_value
         return result