Changeset 8074 for main/waeup.kofa/trunk/src/waeup/kofa/widgets

Timestamp:

9 Apr 2012, 10:31:02 (12 years ago)

Author:

Henrik Bettermann

Message:

The 'ext' part of the phone widget should be optional.

File:

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

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

@@ -121 +121 @@
                 _("Int. prefix requires format '+NNN'"),
                 ValueError('invalid international prefix'))
-        if (parts[1] != '' and not RE_NUMBERS.match(parts[1])) or (
-            parts[2] != '' and not RE_NUMBERS_AND_HYPHENS.match(
-            parts[2])):
+        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:
             raise ConversionError(
                 _("Phone numbers may contain numbers only."),