Generated files for metadata

daviddrysdale · Jun 4, 2024 · 6fa1444 · 6fa1444
1 parent 0949de6
commit 6fa1444
Show file tree

Hide file tree

Showing 10 changed files with 58 additions and 99 deletions.
diff --git a/python/phonenumbers/carrierdata/data0.py b/python/phonenumbers/carrierdata/data0.py
@@ -1196,6 +1196,7 @@
  '24493':{'en': 'UNITEL'},
  '24494':{'en': 'UNITEL'},
  '24495':{'en': 'Africell'},
+ '24497':{'en': 'UNITEL'},
  '24499':{'en': 'Movicel'},
  '24595':{'en': 'Orange'},
  '24596':{'en': 'Spacetel'},
@@ -3422,7 +3423,7 @@
  '407019':{'en': 'Lycamobile'},
  '40702':{'en': 'Lycamobile'},
  '40705':{'en': 'Iristel'},
- '40711':{'en': 'Telekom'},
+ '40711':{'en': 'Orange'},
  '40712':{'en': 'Orange'},
  '40713':{'en': 'Orange'},
  '4072':{'en': 'Vodafone'},
@@ -3438,7 +3439,13 @@
  '40775':{'en': 'Digi Mobil'},
  '40776':{'en': 'Digi Mobil'},
  '40777':{'en': 'Digi Mobil'},
- '4078':{'en': 'Telekom'},
+ '40780':{'en': 'Telekom'},
+ '40783':{'en': 'Orange'},
+ '40784':{'en': 'Telekom'},
+ '40785':{'en': 'Telekom'},
+ '40786':{'en': 'Telekom'},
+ '40787':{'en': 'Orange'},
+ '40788':{'en': 'Telekom'},
  '4079':{'en': 'Vodafone'},
  '4168':{'en': 'Swisscom'},
  '4169':{'en': 'Swisscom'},
@@ -3901,7 +3908,7 @@
  '4474061':{'en': 'Cheers'},
  '4474062':{'en': 'Cheers'},
  '4474065':{'en': 'Telecom2'},
- '4474066':{'en': '24 Seven'},
+ '4474066':{'en': 'Sure'},
  '4474067':{'en': 'TGL'},
  '4474068':{'en': '08Direct'},
  '4474069':{'en': 'CardBoardFish'},
@@ -4376,7 +4383,7 @@
  '4478928':{'en': 'O2'},
  '4478929':{'en': 'O2'},
  '4478930':{'en': 'Magrathea'},
- '4478931':{'en': '24 Seven'},
+ '4478931':{'en': 'Sure'},
  '4478932':{'en': 'O2'},
  '4478933':{'en': 'Yim Siam'},
  '4478934':{'en': 'O2'},
@@ -4404,9 +4411,9 @@
  '447910':{'en': 'EE'},
  '4479110':{'en': 'Marathon Telecom'},
  '4479111':{'en': 'JT'},
- '4479112':{'en': '24 Seven'},
+ '4479112':{'en': 'Sure'},
  '4479117':{'en': 'JT'},
- '4479118':{'en': '24 Seven'},
+ '4479118':{'en': 'Sure'},
  '447912':{'en': 'O2'},
  '447913':{'en': 'EE'},
  '447914':{'en': 'EE'},
@@ -5716,6 +5723,8 @@
  '46720902':{'en': 'Telavox AB'},
  '46720908':{'en': 'Telavox AB'},
  '4672092':{'en': 'Telavox AB'},
+ '46720995':{'en': 'Telavox AB'},
+ '46720996':{'en': 'Telavox AB'},
  '46720999':{'en': 'MOBIWEB LTD'},
  '467210':{'en': 'SVENSK KONSUMENTMOBI'},
  '467211':{'en': 'SVENSK KONSUMENTMOBI'},
@@ -5828,6 +5837,7 @@
  '46726428':{'en': 'Global Telefoni Sve'},
  '46726429':{'en': 'Global Telefoni Sve'},
  '4672644':{'en': 'Telenor Sverige'},
+ '4672648':{'en': 'Telavox AB'},
  '467265':{'en': 'TeliaSonera'},
  '4672660':{'en': 'Telenor Sverige'},
  '4672666':{'en': 'Telenor Sverige'},
@@ -10009,14 +10019,4 @@
  '55319821':{'en': 'Claro'},
  '55319822':{'en': 'Claro'},
  '55319823':{'en': 'Claro'},
- '553198240':{'en': 'Claro'},
- '553198241':{'en': 'Claro'},
- '553198242':{'en': 'Claro'},
- '553198243':{'en': 'Claro'},
- '553198244':{'en': 'Claro'},
- '553198245':{'en': 'Claro'},
- '5531983':{'en': 'Claro'},
- '5531984':{'en': 'Claro'},
- '5531985':{'en': 'Oi'},
- '5531986':{'en': 'Oi'},
 }
diff --git a/python/phonenumbers/carrierdata/data1.py b/python/phonenumbers/carrierdata/data1.py
@@ -19,6 +19,16 @@
 # limitations under the License.
 
 data = {
+ '553198240':{'en': 'Claro'},
+ '553198241':{'en': 'Claro'},
+ '553198242':{'en': 'Claro'},
+ '553198243':{'en': 'Claro'},
+ '553198244':{'en': 'Claro'},
+ '553198245':{'en': 'Claro'},
+ '5531983':{'en': 'Claro'},
+ '5531984':{'en': 'Claro'},
+ '5531985':{'en': 'Oi'},
+ '5531986':{'en': 'Oi'},
  '5531987':{'en': 'Oi'},
  '5531988':{'en': 'Oi'},
  '5531989':{'en': 'Oi'},
@@ -10009,14 +10019,4 @@
  '5699385':{'en': 'Claro'},
  '5699386':{'en': 'Claro'},
  '5699387':{'en': 'Claro'},
- '5699388':{'en': 'Claro'},
- '5699389':{'en': 'Movistar'},
- '569939':{'en': 'Claro'},
- '56994':{'en': 'Movistar'},
- '569941':{'en': 'Entel'},
- '569947':{'en': 'Entel'},
- '569948':{'en': 'Entel'},
- '569949':{'en': 'Entel'},
- '569950':{'en': 'Entel'},
- '569951':{'en': 'Entel'},
 }
diff --git a/python/phonenumbers/carrierdata/data2.py b/python/phonenumbers/carrierdata/data2.py
@@ -19,6 +19,16 @@
 # limitations under the License.
 
 data = {
+ '5699388':{'en': 'Claro'},
+ '5699389':{'en': 'Movistar'},
+ '569939':{'en': 'Claro'},
+ '56994':{'en': 'Movistar'},
+ '569941':{'en': 'Entel'},
+ '569947':{'en': 'Entel'},
+ '569948':{'en': 'Entel'},
+ '569949':{'en': 'Entel'},
+ '569950':{'en': 'Entel'},
+ '569951':{'en': 'Entel'},
  '569952':{'en': 'Movistar'},
  '569953':{'en': 'Movistar'},
  '569954':{'en': 'Movistar'},
@@ -533,6 +543,7 @@
  '592741':{'en': 'E-Networks'},
  '592742':{'en': 'E-Networks'},
  '592749':{'en': 'GTT'},
+ '59275':{'en': 'GTT'},
  '59393':{'en': 'Claro'},
  '5939586':{'en': 'Movistar'},
  '5939587':{'en': 'Movistar'},
@@ -2653,19 +2664,16 @@
  '68988':{'en': 'Viti'},
  '68989':{'en': 'Vodafone'},
  '6907':{'en': 'Teletok telecommunications'},
+ '69132':{'en': 'FSMTC'},
+ '69133':{'en': 'FSMTC'},
+ '69135':{'en': 'FSMTC'},
+ '69137':{'en': 'FSMTC'},
  '6918':{'en': 'FSMTC'},
- '691920':{'en': 'FSMTC'},
- '691921':{'en': 'FSMTC'},
- '691922':{'en': 'FSMTC'},
- '691923':{'en': 'FSMTC'},
- '691924':{'en': 'FSMTC'},
- '691925':{'en': 'FSMTC'},
- '691926':{'en': 'FSMTC'},
- '691930':{'en': 'FSMTC'},
- '691931':{'en': 'FSMTC'},
- '691932':{'en': 'FSMTC'},
- '691933':{'en': 'FSMTC'},
+ '69192':{'en': 'FSMTC'},
+ '69193':{'en': 'FSMTC'},
+ '69194':{'en': 'FSMTC'},
  '69195':{'en': 'FSMTC'},
+ '69196':{'en': 'BOOM!'},
  '69197':{'en': 'FSMTC'},
  '69223':{'en': 'National Telecommunications Authority'},
  '6923':{'en': 'National Telecommunications Authority'},

diff --git a/python/phonenumbers/data/region_AO.py b/python/phonenumbers/data/region_AO.py
@@ -4,5 +4,5 @@
 PHONE_METADATA_AO = PhoneMetadata(id='AO', country_code=244, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='[29]\\d{8}', possible_length=(9,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='2\\d(?:[0134][25-9]|[25-9]\\d)\\d{5}', example_number='222123456', possible_length=(9,)),
-    mobile=PhoneNumberDesc(national_number_pattern='9[1-59]\\d{7}', example_number='923123456', possible_length=(9,)),
+    mobile=PhoneNumberDesc(national_number_pattern='9[1-579]\\d{7}', example_number='923123456', possible_length=(9,)),
     number_format=[NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[29]'])])
diff --git a/python/phonenumbers/data/region_GB.py b/python/phonenumbers/data/region_GB.py
@@ -3,7 +3,7 @@
 
 PHONE_METADATA_GB = PhoneMetadata(id='GB', country_code=44, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='[1-357-9]\\d{9}|[18]\\d{8}|8\\d{6}', possible_length=(7, 9, 10), possible_length_local_only=(4, 5, 6, 8)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:(?:[0-5]\\d|70)\\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[0-2]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}', example_number='1212345678', possible_length=(9, 10), possible_length_local_only=(4, 5, 6, 7, 8)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0-35])|4(?:(?:[0-5]\\d|70)\\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[0-3]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}', example_number='1212345678', possible_length=(9, 10), possible_length_local_only=(4, 5, 6, 7, 8)),
     mobile=PhoneNumberDesc(national_number_pattern='7(?:457[0-57-9]|700[01]|911[028])\\d{5}|7(?:[1-3]\\d\\d|4(?:[0-46-9]\\d|5[0-689])|5(?:0[0-8]|[13-9]\\d|2[0-35-9])|7(?:0[1-9]|[1-7]\\d|8[02-9]|9[0-689])|8(?:[014-9]\\d|[23][0-8])|9(?:[024-9]\\d|1[02-9]|3[0-689]))\\d{6}', example_number='7400123456', possible_length=(10,)),
     toll_free=PhoneNumberDesc(national_number_pattern='80[08]\\d{7}|800\\d{6}|8001111', example_number='8001234567', possible_length=(7, 9, 10)),
     premium_rate=PhoneNumberDesc(national_number_pattern='(?:8(?:4[2-5]|7[0-3])|9(?:[01]\\d|8[2-49]))\\d{7}|845464\\d', example_number='9012345678', possible_length=(7, 10)),

diff --git a/python/phonenumbers/data/region_GY.py b/python/phonenumbers/data/region_GY.py
@@ -4,7 +4,7 @@
 PHONE_METADATA_GY = PhoneMetadata(id='GY', country_code=592, international_prefix='001',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:[2-8]\\d{3}|9008)\\d{3}', possible_length=(7,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:1[6-9]|2[0-35-9]|3[1-4]|5[3-9]|6\\d|7[0-79])|3(?:2[25-9]|3\\d)|4(?:4[0-24]|5[56])|50[0-6]|77[1-57])\\d{4}', example_number='2201234', possible_length=(7,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:510|6\\d\\d|7(?:[013]\\d|2[0-25-8]|4[0-29]))\\d{4}', example_number='6091234', possible_length=(7,)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:510|6\\d\\d|7(?:[013]\\d|2[0-25-8]|4[0-29]|5[1-9]))\\d{4}', example_number='6091234', possible_length=(7,)),
     toll_free=PhoneNumberDesc(national_number_pattern='(?:289|8(?:00|6[28]|88|99))\\d{4}', example_number='2891234', possible_length=(7,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='9008\\d{3}', example_number='9008123', possible_length=(7,)),
     voip=PhoneNumberDesc(national_number_pattern='515\\d{4}', example_number='5151234', possible_length=(7,)),

diff --git a/python/phonenumbers/data/region_HK.py b/python/phonenumbers/data/region_HK.py
@@ -3,7 +3,7 @@
 
 PHONE_METADATA_HK = PhoneMetadata(id='HK', country_code=852, international_prefix='00(?:30|5[09]|[126-9]?)',
     general_desc=PhoneNumberDesc(national_number_pattern='8[0-46-9]\\d{6,7}|9\\d{4,7}|(?:[2-7]|9\\d{3})\\d{7}', possible_length=(5, 6, 7, 8, 9, 11)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[59]\\d|6[01]))|58(?:0[1-9]|1[2-9]))\\d{4}', example_number='21234567', possible_length=(8,)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[59]\\d|6[0-2]))|58(?:0[1-9]|1[2-9]))\\d{4}', example_number='21234567', possible_length=(8,)),
     mobile=PhoneNumberDesc(national_number_pattern='(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|848[0-35-9]|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-8]|6[02357-9])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[129]|84[0-29]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', example_number='51234567', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6}', example_number='800123456', possible_length=(9,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900(?:[0-24-9]\\d{7}|3\\d{1,4})', example_number='90012345678', possible_length=(5, 6, 7, 8, 11)),

diff --git a/python/phonenumbers/data/region_MX.py b/python/phonenumbers/data/region_MX.py
@@ -2,23 +2,17 @@
 from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_MX = PhoneMetadata(id='MX', country_code=52, international_prefix='0[09]',
-    general_desc=PhoneNumberDesc(national_number_pattern='1(?:(?:22|44|7[27]|87|9[69])[1-9]|65[0-689])\\d{7}|(?:1(?:[01]\\d|2[13-9]|[35][1-9]|4[0-35-9]|6[0-46-9]|7[013-689]|8[1-69]|9[1-578])|[2-9]\\d)\\d{8}', possible_length=(10, 11), possible_length_local_only=(7, 8)),
+    general_desc=PhoneNumberDesc(national_number_pattern='[2-9]\\d{9}', possible_length=(10,), possible_length_local_only=(7, 8)),
     fixed_line=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}', example_number='2001234567', possible_length=(10,), possible_length_local_only=(7, 8)),
-    mobile=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:1(?:2(?:2[1-9]|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[24-7][1-9]|3[1-8]|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1-467][1-9]|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[1-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69][1-9]|7[12]|8[1-8]))|2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}', example_number='12221234567', possible_length=(10, 11), possible_length_local_only=(7, 8)),
+    mobile=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[25-7][1-9]|3[1-8]|4\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[1-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}', example_number='2221234567', possible_length=(10,), possible_length_local_only=(7, 8)),
     toll_free=PhoneNumberDesc(national_number_pattern='8(?:00|88)\\d{7}', example_number='8001234567', possible_length=(10,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{7}', example_number='9001234567', possible_length=(10,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='300\\d{7}', example_number='3001234567', possible_length=(10,)),
     personal_number=PhoneNumberDesc(national_number_pattern='500\\d{7}', example_number='5001234567', possible_length=(10,)),
     preferred_international_prefix='00',
-    national_prefix='01',
-    national_prefix_for_parsing='0(?:[12]|4[45])|1',
     number_format=[NumberFormat(pattern='(\\d{5})', format='\\1', leading_digits_pattern=['53']),
-        NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['33|5[56]|81'], national_prefix_optional_when_formatting=True),
-        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-9]'], national_prefix_optional_when_formatting=True),
-        NumberFormat(pattern='(\\d)(\\d{2})(\\d{4})(\\d{4})', format='\\2 \\3 \\4', leading_digits_pattern=['1(?:33|5[56]|81)'], national_prefix_optional_when_formatting=True),
-        NumberFormat(pattern='(\\d)(\\d{3})(\\d{3})(\\d{4})', format='\\2 \\3 \\4', leading_digits_pattern=['1'], national_prefix_optional_when_formatting=True)],
+        NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['33|5[56]|81']),
+        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-9]'])],
     intl_number_format=[NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['33|5[56]|81']),
-        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-9]']),
-        NumberFormat(pattern='(\\d)(\\d{2})(\\d{4})(\\d{4})', format='\\2 \\3 \\4', leading_digits_pattern=['1(?:33|5[56]|81)']),
-        NumberFormat(pattern='(\\d)(\\d{3})(\\d{3})(\\d{4})', format='\\2 \\3 \\4', leading_digits_pattern=['1'])],
+        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-9]'])],
     mobile_number_portable_region=True)
diff --git a/python/phonenumbers/tzdata/__init__.py b/python/phonenumbers/tzdata/__init__.py
@@ -22,4 +22,4 @@
 from .data0 import data
 TIMEZONE_DATA.update(data)
 del data
-TIMEZONE_LONGEST_PREFIX = 8
+TIMEZONE_LONGEST_PREFIX = 9
diff --git a/python/phonenumbers/tzdata/data0.py b/python/phonenumbers/tzdata/data0.py
@@ -2162,7 +2162,8 @@
  '3518':('Atlantic/Azores', 'Europe/Lisbon'),
  '3519':('Atlantic/Azores', 'Europe/Lisbon'),
  '352':('Europe/Luxembourg',),
- '353':('Europe/Dublin',),
+ '353':('Europe/Guernsey', 'Europe/Isle_of_Man', 'Europe/London'),
+ '353539253':('Europe/Guernsey', 'Europe/Isle_of_Man', 'Europe/London'),
  '354':('Atlantic/Reykjavik',),
  '355':('Europe/Tirane',),
  '356':('Europe/Malta',),
@@ -2191,7 +2192,7 @@
  '370':('Europe/Bucharest',),
  '371':('Europe/Bucharest',),
  '372':('Europe/Bucharest',),
- '373':('Europe/Bucharest',),
+ '373':('Europe/Chisinau',),
  '374':('Asia/Yerevan',),
  '375':('Europe/Moscow',),
  '376':('Europe/Andorra',),
@@ -2281,50 +2282,6 @@
  '509':('America/Port-au-Prince',),
  '51':('America/Lima',),
  '52':('America/Hermosillo', 'America/Mazatlan', 'America/Mexico_City', 'America/New_York', 'America/Tijuana'),
- '521':('America/Mexico_City',),
- '521311':('America/Mazatlan',),
- '521319':('America/Mazatlan',),
- '521323':('America/Mazatlan',),
- '521324':('America/Mazatlan',),
- '521325':('America/Mazatlan',),
- '521327':('America/Mazatlan',),
- '521389':('America/Mazatlan',),
- '521612':('America/Mazatlan',),
- '521613':('America/Mazatlan',),
- '521614':('America/Mazatlan',),
- '521615':('America/Mazatlan',),
- '521616':('America/Tijuana',),
- '52162':('America/Mazatlan',),
- '521626':('America/Hermosillo', 'America/Tijuana'),
- '52163':('America/Mazatlan',),
- '521636':('America/Hermosillo', 'America/Mazatlan'),
- '52164':('America/Mazatlan',),
- '521646':('America/Tijuana',),
- '521647':('America/Mazatlan', 'America/Tijuana'),
- '521651':('America/Mazatlan',),
- '521652':('America/Mazatlan',),
- '521653':('America/Mazatlan',),
- '521656':('America/Hermosillo',),
- '521658':('America/Tijuana',),
- '521659':('America/Mazatlan',),
- '521661':('America/Tijuana',),
- '521662':('America/Mazatlan',),
- '521663':('America/Mazatlan',),
- '521664':('America/Tijuana',),
- '521665':('America/Tijuana',),
- '521667':('America/Mazatlan',),
- '521668':('America/Mazatlan',),
- '521669':('America/Mazatlan',),
- '521672':('America/Mazatlan',),
- '521673':('America/Mazatlan',),
- '521686':('America/Tijuana',),
- '521687':('America/Mazatlan',),
- '52169':('America/Mazatlan',),
- '521877':('America/Mexico_City', 'America/Tijuana'),
- '521983':('America/New_York',),
- '521984':('America/New_York',),
- '521987':('America/New_York',),
- '521998':('America/New_York',),
  '522':('America/Mexico_City',),
  '52200':('America/Mexico_City', 'America/Tijuana'),
  '52201':('America/Mexico_City', 'America/New_York'),