chawda110
diff --git a/‎python/phonenumbers/phonemetadata.py‎
Lines changed: 2 additions & 5 deletions b/‎python/phonenumbers/phonemetadata.py‎
Lines changed: 2 additions & 5 deletions
diff --git a/‎python/tests/phonenumberutiltest.py‎
Lines changed: 1 addition & 1 deletion b/‎python/tests/phonenumberutiltest.py‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎tools/python/buildmetadatafromxml.py‎
Lines changed: 12 additions & 8 deletions b/‎tools/python/buildmetadatafromxml.py‎
Lines changed: 12 additions & 8 deletions
@@ -487,11 +487,8 @@ def __repr__(self):
 
     def __unicode__(self):
         # Generate a string that is valid Python input for the constructor
-        country_code = self.country_code
-        if country_code is None:
-            country_code = -1
-        result = (u"PhoneMetadata(id='%s', country_code=%d, international_prefix=%r" %
-                  (self.id, country_code, self.international_prefix))
+        result = (u"PhoneMetadata(id='%s', country_code=%r, international_prefix=%r" %
+                  (self.id, self.country_code, self.international_prefix))
         result += ",\n    general_desc=%s" % self.general_desc
         result += ",\n    fixed_line=%s" % self.fixed_line
         result += ",\n    mobile=%s" % self.mobile
 
@@ -2476,7 +2476,7 @@ def testMetadataAsString(self):
                                    leading_digits='123',
                                    leading_zero_possible=True,
                                    register=False)
-        self.assertEqual("""PhoneMetadata(id='XX', country_code=-1, international_prefix='9123',
+        self.assertEqual("""PhoneMetadata(id='XX', country_code=None, international_prefix='9123',
     general_desc=PhoneNumberDesc(example_number='12'),
     fixed_line=None,
     mobile=None,
 
@@ -355,7 +355,10 @@ def __init__(self, xterritory):
         id = xterritory.attrib['id']
         self.o = PhoneMetadata(id, register=False)
         self.o._mutable = True
-        self.o.country_code = int(xterritory.attrib['countryCode'])
+        if 'countryCode' in xterritory.attrib:
+            self.o.country_code = int(xterritory.attrib['countryCode'])
+        else:
+            self.o.country_code = None
         # Retrieve the IMPLIED attributes
         self.o.international_prefix = xterritory.get('internationalPrefix', None)
         self.o.leading_digits = xterritory.get('leadingDigits', None)
@@ -558,13 +561,14 @@ def emit_metadata_py(self, datadir, module_prefix):
             country_code_to_region_code = {}
             for country_id in sorted(self.territory.keys()):
                 terrobj = self.territory[country_id]
-                country_code = int(terrobj.o.country_code)
-                if country_code not in country_code_to_region_code:
-                    country_code_to_region_code[country_code] = []
-                if terrobj.o.main_country_for_code:
-                    country_code_to_region_code[country_code].insert(0, terrobj.o.id)
-                else:
-                    country_code_to_region_code[country_code].append(terrobj.o.id)
+                if terrobj.o.country_code is not None:
+                    country_code = int(terrobj.o.country_code)
+                    if country_code not in country_code_to_region_code:
+                        country_code_to_region_code[country_code] = []
+                    if terrobj.o.main_country_for_code:
+                        country_code_to_region_code[country_code].insert(0, terrobj.o.id)
+                    else:
+                        country_code_to_region_code[country_code].append(terrobj.o.id)
 
             for country_code in sorted(country_code_to_region_code.keys()):
                 country_ids = country_code_to_region_code[country_code]