pythonthings
diff --git a/‎tools/python/buildmetadatafromxml.py‎
Lines changed: 17 additions & 15 deletions b/‎tools/python/buildmetadatafromxml.py‎
Lines changed: 17 additions & 15 deletions
@@ -310,7 +310,7 @@ def __unicode__(self):
 
 class XPhoneNumberDesc(UnicodeMixin):
     """Parse PhoneNumberDesc object from XML element"""
-    def __init__(self, xterritory, tag, template=None, general_desc=False):
+    def __init__(self, xterritory, tag, template=None, has_possible_lengths=True, has_example_number=True):
         id = xterritory.attrib['id']
         xtag = _get_unique_child(xterritory, tag)
         self.xtag = xtag
@@ -340,23 +340,23 @@ def __init__(self, xterritory, tag, template=None, general_desc=False):
             else:
                 raise Exception("Missing required nationalNumberPattern element in %s.%s" % (id, tag))
 
-        # An exampleNumber element is present iff this is not the generalDesc
+        # An exampleNumber element may be present.
         example_number = _get_unique_child_value(xtag, 'exampleNumber')
-        if (not lax) and (not general_desc) and (example_number is None):
+        if (not lax) and has_example_number and (example_number is None):
             raise Exception("Missing required exampleNumber element in %s.%s" % (id, tag))
-        if general_desc and example_number is not None:
+        if (not has_example_number) and example_number is not None:
             if lax:
                 example_number = None
             else:
-                raise Exception("Unexpected exampleNumber element for generalDesc in %s.%s" % (id, tag))
+                raise Exception("Unexpected exampleNumber element in %s.%s" % (id, tag))
         self.o.example_number = example_number
 
-        # A possibleLengths element is present iff this is not the generalDesc
+        # A possibleLengths element may be present.
         possible_lengths = _get_unique_child(xtag, 'possibleLengths')
-        if (not lax) and (not general_desc) and (possible_lengths is None):
+        if (not lax) and has_possible_lengths and (possible_lengths is None):
             raise Exception("Missing required possibleLengths element in %s.%s" % (id, tag))
-        if general_desc and possible_lengths is not None:
-            raise Exception("Unexpected possibleLengths for generalDesc in %s.%s" % (id, tag))
+        if (not has_possible_lengths) and possible_lengths is not None:
+            raise Exception("Unexpected possibleLengths in %s.%s" % (id, tag))
         if possible_lengths is not None:
             national_lengths = possible_lengths.attrib['national']  # REQUIRED attribute
             if national_lengths == "-1":
@@ -430,12 +430,14 @@ def __init__(self, xterritory, short_data):
         self.o.leading_zero_possible = get_true_attrib(xterritory, 'leadingZeroPossible')
         self.o.mobile_number_portable_region = get_true_attrib(xterritory, 'mobileNumberPortableRegion')
 
-        # Retrieve the various PhoneNumberDesc elements, which mostly have the form:
-        #   (nationalNumberPattern, possibleLengths, exampleNumber)
-        # However the general_desc is first and special; it has form:
+        # Retrieve the various PhoneNumberDesc elements, which have one of the forms:
+        #   (possibleLengths, exampleNumber, nationalNumberPattern)
+        #   (possibleLengths, nationalNumberPattern)
         #   (nationalNumberPattern)
-        # and it will be used to fill out missing fields in many of the other PhoneNumberDesc elements.
-        self.o.general_desc = XPhoneNumberDesc(xterritory, 'generalDesc', general_desc=True).o
+
+        # The general_desc is first and special; it is used to fill out missing fields
+        # in many of the other PhoneNumberDesc elements.
+        self.o.general_desc = XPhoneNumberDesc(xterritory, 'generalDesc', has_possible_lengths=False, has_example_number=False).o
 
         self.o.toll_free = XPhoneNumberDesc(xterritory, 'tollFree', template=self.o.general_desc).o
         self.o.premium_rate = XPhoneNumberDesc(xterritory, 'premiumRate', template=self.o.general_desc).o
@@ -450,7 +452,7 @@ def __init__(self, xterritory, short_data):
             self.o.voip = XPhoneNumberDesc(xterritory, 'voip', template=self.o.general_desc).o
             self.o.uan = XPhoneNumberDesc(xterritory, 'uan', template=self.o.general_desc).o
             self.o.voicemail = XPhoneNumberDesc(xterritory, 'voicemail', template=self.o.general_desc).o
-            self.o.no_international_dialling = XPhoneNumberDesc(xterritory, 'noInternationalDialling', template=self.o.general_desc).o
+            self.o.no_international_dialling = XPhoneNumberDesc(xterritory, 'noInternationalDialling', template=self.o.general_desc, has_example_number=False).o
 
             # Skip noInternationalDialling when combining possible length information
             sub_descs = (self.o.toll_free, self.o.premium_rate, self.o.fixed_line, self.o.mobile,