From 5867449a852f2db52e88758ca2eb7d2aff8e05ba Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Fri, 4 Oct 2024 06:49:13 +0100 Subject: [PATCH] Generated files for metadata --- python/phonenumbers/carrierdata/data0.py | 4 ++-- python/phonenumbers/carrierdata/data1.py | 4 ++-- python/phonenumbers/carrierdata/data2.py | 11 ++++++++++- python/phonenumbers/data/region_GE.py | 2 +- python/phonenumbers/data/region_HK.py | 2 +- python/phonenumbers/data/region_MG.py | 2 +- python/phonenumbers/data/region_MM.py | 6 +++--- python/phonenumbers/data/region_NO.py | 2 +- python/phonenumbers/data/region_SJ.py | 2 +- python/phonenumbers/data/region_UA.py | 2 +- python/phonenumbers/data/region_UG.py | 2 +- python/phonenumbers/geodata/data10.py | 2 +- python/phonenumbers/geodata/data11.py | 2 +- python/phonenumbers/geodata/data12.py | 2 +- python/phonenumbers/geodata/data13.py | 2 +- python/phonenumbers/geodata/data14.py | 2 +- python/phonenumbers/geodata/data15.py | 2 +- python/phonenumbers/geodata/data16.py | 2 +- python/phonenumbers/geodata/data17.py | 2 +- python/phonenumbers/geodata/data18.py | 2 +- python/phonenumbers/geodata/data19.py | 2 +- python/phonenumbers/geodata/data20.py | 2 +- python/phonenumbers/geodata/data21.py | 2 +- python/phonenumbers/geodata/data22.py | 2 +- python/phonenumbers/geodata/data23.py | 2 +- python/phonenumbers/geodata/data24.py | 2 +- python/phonenumbers/geodata/data25.py | 2 +- python/phonenumbers/geodata/data26.py | 2 +- python/phonenumbers/geodata/data27.py | 2 +- python/phonenumbers/geodata/data28.py | 2 ++ python/phonenumbers/geodata/data3.py | 2 +- python/phonenumbers/geodata/data4.py | 2 +- python/phonenumbers/geodata/data5.py | 4 ++-- python/phonenumbers/geodata/data6.py | 2 +- python/phonenumbers/geodata/data7.py | 2 +- python/phonenumbers/geodata/data8.py | 2 +- python/phonenumbers/geodata/data9.py | 2 +- python/phonenumbers/shortdata/region_NO.py | 5 +++-- python/phonenumbers/shortdata/region_SJ.py | 5 +++-- 39 files changed, 58 insertions(+), 45 deletions(-) diff --git a/python/phonenumbers/carrierdata/data0.py b/python/phonenumbers/carrierdata/data0.py index 1321ec169..349d8b305 100644 --- a/python/phonenumbers/carrierdata/data0.py +++ b/python/phonenumbers/carrierdata/data0.py @@ -1316,6 +1316,7 @@ '256720':{'en': 'Smile'}, '256724':{'en': 'Hamilton Telecom'}, '256726':{'en': 'Tangerine'}, + '256727':{'en': 'Tangerine'}, '256728':{'en': 'Talkio'}, '25673':{'en': 'Hamilton Telecom'}, '25674':{'en': 'Airtel'}, @@ -3282,6 +3283,7 @@ '38073':{'en': 'lifecell', 'uk': 'lifecell'}, '38075':{'en': 'Vodafone', 'uk': u('Vodafone \u0423\u043a\u0440\u0430\u0457\u043d\u0430')}, '38077':{'en': 'Kyivstar', 'uk': u('\u041a\u0438\u0457\u0432\u0441\u0442\u0430\u0440')}, + '38079':{'en': 'J&Y', 'uk': 'J&Y'}, '38091':{'en': 'TriMob', 'uk': u('\u0422\u0440\u0438\u041c\u043e\u0431')}, '38092':{'en': 'PEOPLEnet', 'uk': 'PEOPLEnet'}, '38093':{'en': 'lifecell', 'uk': 'lifecell'}, @@ -10017,6 +10019,4 @@ '552899986':{'en': 'Vivo'}, '552899987':{'en': 'Vivo'}, '552899988':{'en': 'Vivo'}, - '552899989':{'en': 'Vivo'}, - '552899991':{'en': 'Vivo'}, } diff --git a/python/phonenumbers/carrierdata/data1.py b/python/phonenumbers/carrierdata/data1.py index b53947893..0250e1041 100644 --- a/python/phonenumbers/carrierdata/data1.py +++ b/python/phonenumbers/carrierdata/data1.py @@ -19,6 +19,8 @@ # limitations under the License. data = { + '552899989':{'en': 'Vivo'}, + '552899991':{'en': 'Vivo'}, '552899992':{'en': 'Vivo'}, '552899993':{'en': 'Vivo'}, '552899994':{'en': 'Vivo'}, @@ -10017,6 +10019,4 @@ '569929':{'en': 'Entel'}, '569930':{'en': 'Entel'}, '569931':{'en': 'Entel'}, - '569932':{'en': 'Movistar'}, - '569933':{'en': 'Movistar'}, } diff --git a/python/phonenumbers/carrierdata/data2.py b/python/phonenumbers/carrierdata/data2.py index 1d8025df0..683146787 100644 --- a/python/phonenumbers/carrierdata/data2.py +++ b/python/phonenumbers/carrierdata/data2.py @@ -19,6 +19,8 @@ # limitations under the License. data = { + '569932':{'en': 'Movistar'}, + '569933':{'en': 'Movistar'}, '569934':{'en': 'Movistar'}, '569935':{'en': 'Entel'}, '569936':{'en': 'Movistar'}, @@ -4126,6 +4128,7 @@ '8524699':{'en': 'South China Telecommunications', 'zh': u('\u4e2d\u570b\u5357\u65b9\u96fb\u4fe1(\u9999\u6e2f)\u6709\u9650\u516c\u53f8')}, '852470':{'en': 'Hutchison Telecom', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')}, '852474':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')}, + '852475':{'en': 'Hutchison Telecom', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')}, '852510':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8'), 'zh_Hant': u('\u4e2d\u570b\u79fb\u52d5')}, '852511':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf'), 'zh_Hant': u('\u65b0\u79fb\u52d5\u901a\u8a0a')}, '852512':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8'), 'zh_Hant': u('\u4e2d\u570b\u79fb\u52d5')}, @@ -4347,6 +4350,7 @@ '852701':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')}, '852702':{'en': 'Hutchison Telecom', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')}, '852703':{'en': 'Hutchison Telecom', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')}, + '852704':{'en': 'Hutchison Telecom', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')}, '8527071':{'en': 'SmarTone', 'zh': u('\u6570\u7801\u901a')}, '8527072':{'en': 'SmarTone', 'zh': u('\u6570\u7801\u901a')}, '8527073':{'en': 'SmarTone', 'zh': u('\u6570\u7801\u901a')}, @@ -8802,7 +8806,12 @@ '9955112':{'en': 'MagtiCom'}, '9955113':{'en': 'MagtiCom'}, '9955114':{'en': 'MagtiCom'}, - '9955115':{'en': 'Silknet'}, + '99551151':{'en': 'Silknet'}, + '99551152':{'en': 'MagtiCom'}, + '99551153':{'en': 'MagtiCom'}, + '99551154':{'en': 'MagtiCom'}, + '99551155':{'en': 'MagtiCom'}, + '99551156':{'en': 'MagtiCom'}, '9955117':{'en': 'MagtiCom'}, '995514':{'en': 'Silknet'}, '995515':{'en': 'MagtiCom'}, diff --git a/python/phonenumbers/data/region_GE.py b/python/phonenumbers/data/region_GE.py index e1bb62e7b..76309264c 100644 --- a/python/phonenumbers/data/region_GE.py +++ b/python/phonenumbers/data/region_GE.py @@ -4,7 +4,7 @@ PHONE_METADATA_GE = PhoneMetadata(id='GE', country_code=995, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='(?:[3-57]\\d\\d|800)\\d{6}', possible_length=(9,), possible_length_local_only=(6, 7)), fixed_line=PhoneNumberDesc(national_number_pattern='(?:3(?:[256]\\d|4[124-9]|7[0-4])|4(?:1\\d|2[2-7]|3[1-79]|4[2-8]|7[239]|9[1-7]))\\d{6}', example_number='322123456', possible_length=(9,), possible_length_local_only=(6, 7)), - mobile=PhoneNumberDesc(national_number_pattern='5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d)|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}', example_number='555123456', possible_length=(9,)), + mobile=PhoneNumberDesc(national_number_pattern='5(?:(?:(?:0555|1(?:[17]77|555))[5-9]|757(?:7[7-9]|8[01]))\\d|22252[0-4])\\d\\d|5(?:0(?:0[17]0|505)|1(?:0[01]0|1(?:07|33|51))|2(?:0[02]0|2[25]2)|3(?:0[03]0|3[35]3)|(?:40[04]|900)0|5222)[0-4]\\d{3}|(?:5(?:0(?:0(?:0\\d|11|22|3[0-6]|44|5[05]|77|88|9[09])|111|22[02]|77\\d)|1(?:1(?:[03][01]|[124]\\d|5[2-6]|7[0-4])|4\\d\\d)|[23]555|4(?:4\\d\\d|555)|5(?:[0157-9]\\d\\d|200)|6[89]\\d\\d|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|5(?:55|8[89])|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}', example_number='555123456', possible_length=(9,)), toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6}', example_number='800123456', possible_length=(9,)), voip=PhoneNumberDesc(national_number_pattern='70[67]\\d{6}', example_number='706123456', possible_length=(9,)), no_international_dialling=PhoneNumberDesc(national_number_pattern='70[67]\\d{6}', possible_length=(9,)), diff --git a/python/phonenumbers/data/region_HK.py b/python/phonenumbers/data/region_HK.py index a9a19f7cb..ac2d46872 100644 --- a/python/phonenumbers/data/region_HK.py +++ b/python/phonenumbers/data/region_HK.py @@ -4,7 +4,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]|[579]\\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])|74[0-2])|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|70)|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[1-39]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', example_number='51234567', possible_length=(8,)), + mobile=PhoneNumberDesc(national_number_pattern='(?:4(?:44[0-25-9]|6(?:1[0-7]|4[0-57-9]|6[0-4])|74[0-2])|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[01]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[05])|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[1-49]|84[0-39]|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)), personal_number=PhoneNumberDesc(national_number_pattern='8(?:1[0-4679]\\d|2(?:[0-36]\\d|7[0-4])|3(?:[034]\\d|2[09]|70))\\d{4}', example_number='81123456', possible_length=(8,)), diff --git a/python/phonenumbers/data/region_MG.py b/python/phonenumbers/data/region_MG.py index 308a13af8..d70c4a5bb 100644 --- a/python/phonenumbers/data/region_MG.py +++ b/python/phonenumbers/data/region_MG.py @@ -3,7 +3,7 @@ PHONE_METADATA_MG = PhoneMetadata(id='MG', country_code=261, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='[23]\\d{8}', possible_length=(9,), possible_length_local_only=(7,)), - fixed_line=PhoneNumberDesc(national_number_pattern='2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[35]|8[268]|9[245])\\d{5}', example_number='202123456', possible_length=(9,), possible_length_local_only=(7,)), + fixed_line=PhoneNumberDesc(national_number_pattern='2072[29]\\d{4}|20(?:2\\d|4[47]|5[3467]|6[279]|7[356]|8[268]|9[245])\\d{5}', example_number='202123456', possible_length=(9,), possible_length_local_only=(7,)), mobile=PhoneNumberDesc(national_number_pattern='3[2-47-9]\\d{7}', example_number='321234567', possible_length=(9,)), voip=PhoneNumberDesc(national_number_pattern='22\\d{7}', example_number='221234567', possible_length=(9,)), national_prefix='0', diff --git a/python/phonenumbers/data/region_MM.py b/python/phonenumbers/data/region_MM.py index 933ee3126..9ab2662f1 100644 --- a/python/phonenumbers/data/region_MM.py +++ b/python/phonenumbers/data/region_MM.py @@ -3,15 +3,15 @@ PHONE_METADATA_MM = PhoneMetadata(id='MM', country_code=95, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='1\\d{5,7}|95\\d{6}|(?:[4-7]|9[0-46-9])\\d{6,8}|(?:2|8\\d)\\d{5,8}', possible_length=(6, 7, 8, 9, 10), possible_length_local_only=(5,)), - fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:(?:2\\d|3[56]|[89][0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5470)|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:(?:3\\d|8[01459])\\d|4[67]0)))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|[35]2\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}', example_number='1234567', possible_length=(6, 7, 8, 9), possible_length_local_only=(5,)), + fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:(?:12|[28]\\d|3[56]|7[3-6]|9[0-6])\\d|4(?:2[29]|62|7[0-2]|83)|6)|2(?:2(?:00|8[34])|4(?:0\\d|[26]2|7[0-2]|83)|51\\d\\d)|4(?:2(?:2\\d\\d|48[013])|3(?:20\\d|4(?:70|83)|56)|420\\d|5(?:2\\d|470))|6(?:0(?:[23]|88\\d)|(?:124|[56]2\\d)\\d|2472|3(?:20\\d|470)|4(?:2[04]\\d|472)|7(?:3\\d\\d|4[67]0|8(?:[01459]\\d|8))))\\d{4}|5(?:2(?:2\\d{5,6}|47[02]\\d{4})|(?:3472|4(?:2(?:1|86)|470)|522\\d|6(?:20\\d|483)|7(?:20\\d|48[01])|8(?:20\\d|47[02])|9(?:20\\d|470))\\d{4})|7(?:(?:0470|4(?:25\\d|470)|5(?:202|470|96\\d))\\d{4}|1(?:20\\d{4,5}|4(?:70|83)\\d{4}))|8(?:1(?:2\\d{5,6}|4(?:10|7[01]\\d)\\d{3})|2(?:2\\d{5,6}|(?:320|490\\d)\\d{3})|(?:3(?:2\\d\\d|470)|4[24-7]|5(?:(?:2\\d|51)\\d|4(?:[1-35-9]\\d|4[0-57-9]))|6[23])\\d{4})|(?:1[2-6]\\d|4(?:2[24-8]|3[2-7]|[46][2-6]|5[3-5])|5(?:[27][2-8]|3[2-68]|4[24-8]|5[23]|6[2-4]|8[24-7]|9[2-7])|6(?:[19]20|42[03-6]|(?:52|7[45])\\d)|7(?:[04][24-8]|[15][2-7]|22|3[2-4])|8(?:1[2-689]|2[2-8]|(?:[35]2|64)\\d))\\d{4}|25\\d{5,6}|(?:2[2-9]|6(?:1[2356]|[24][2-6]|3[24-6]|5[2-4]|6[2-8]|7[235-7]|8[245]|9[24])|8(?:3[24]|5[245]))\\d{4}', example_number='1234567', possible_length=(6, 7, 8, 9), possible_length_local_only=(5,)), mobile=PhoneNumberDesc(national_number_pattern='(?:17[01]|9(?:2(?:[0-4]|[56]\\d\\d)|(?:3(?:[0-36]|4\\d)|(?:6\\d|8[89]|9[4-8])\\d|7(?:3|40|[5-9]\\d))\\d|4(?:(?:[0245]\\d|[1379])\\d|88)|5[0-6])\\d)\\d{4}|9[69]1\\d{6}|9(?:[68]\\d|9[089])\\d{5}', example_number='92123456', possible_length=(7, 8, 9, 10)), toll_free=PhoneNumberDesc(national_number_pattern='80080(?:0[1-9]|2\\d)\\d{3}', example_number='8008001234', possible_length=(10,)), voip=PhoneNumberDesc(national_number_pattern='1333\\d{4}|[12]468\\d{4}', example_number='13331234', possible_length=(8,)), national_prefix='0', national_prefix_for_parsing='0', number_format=[NumberFormat(pattern='(\\d)(\\d{2})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['16|2'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[45]|6(?:0[23]|[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-6]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d)(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[12]'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['4(?:[2-46]|5[3-5])|5|6(?:[1-689]|7[235-7])|7(?:[0-4]|5[2-7])|8[1-5]|(?:60|86)[23]'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d)(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[12]|452|678|86', '[12]|452|6788|86'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[4-7]|8[1-35]'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d)(\\d{3})(\\d{4,6})', format='\\1 \\2 \\3', leading_digits_pattern=['9(?:2[0-4]|[35-9]|4[137-9])'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d)(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['2'], national_prefix_formatting_rule='0\\1'), diff --git a/python/phonenumbers/data/region_NO.py b/python/phonenumbers/data/region_NO.py index c47bb1baf..4a47f5f98 100644 --- a/python/phonenumbers/data/region_NO.py +++ b/python/phonenumbers/data/region_NO.py @@ -10,7 +10,7 @@ shared_cost=PhoneNumberDesc(national_number_pattern='810(?:0[0-6]|[2-8]\\d)\\d{3}', example_number='81021234', possible_length=(8,)), personal_number=PhoneNumberDesc(national_number_pattern='880\\d{5}', example_number='88012345', possible_length=(8,)), voip=PhoneNumberDesc(national_number_pattern='85[0-5]\\d{5}', example_number='85012345', possible_length=(8,)), - uan=PhoneNumberDesc(national_number_pattern='(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', example_number='02000', possible_length=(5, 8)), + uan=PhoneNumberDesc(national_number_pattern='(?:0[235-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', example_number='02000', possible_length=(5, 8)), voicemail=PhoneNumberDesc(national_number_pattern='81[23]\\d{5}', example_number='81212345', possible_length=(8,)), number_format=[NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['8']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['[2-79]'])], diff --git a/python/phonenumbers/data/region_SJ.py b/python/phonenumbers/data/region_SJ.py index 6ae8e72c8..c4c8dc345 100644 --- a/python/phonenumbers/data/region_SJ.py +++ b/python/phonenumbers/data/region_SJ.py @@ -10,6 +10,6 @@ shared_cost=PhoneNumberDesc(national_number_pattern='810(?:0[0-6]|[2-8]\\d)\\d{3}', example_number='81021234', possible_length=(8,)), personal_number=PhoneNumberDesc(national_number_pattern='880\\d{5}', example_number='88012345', possible_length=(8,)), voip=PhoneNumberDesc(national_number_pattern='85[0-5]\\d{5}', example_number='85012345', possible_length=(8,)), - uan=PhoneNumberDesc(national_number_pattern='(?:0[2-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', example_number='02000', possible_length=(5, 8)), + uan=PhoneNumberDesc(national_number_pattern='(?:0[235-9]|81(?:0(?:0[7-9]|1\\d)|5\\d\\d))\\d{3}', example_number='02000', possible_length=(5, 8)), voicemail=PhoneNumberDesc(national_number_pattern='81[23]\\d{5}', example_number='81212345', possible_length=(8,)), leading_digits='79') diff --git a/python/phonenumbers/data/region_UA.py b/python/phonenumbers/data/region_UA.py index c59a46f41..a7ce5ab0c 100644 --- a/python/phonenumbers/data/region_UA.py +++ b/python/phonenumbers/data/region_UA.py @@ -4,7 +4,7 @@ PHONE_METADATA_UA = PhoneMetadata(id='UA', country_code=380, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='[89]\\d{9}|[3-9]\\d{8}', possible_length=(9, 10), possible_length_local_only=(5, 6, 7)), fixed_line=PhoneNumberDesc(national_number_pattern='(?:3[1-8]|4[13-8]|5[1-7]|6[12459])\\d{7}', example_number='311234567', possible_length=(9,), possible_length_local_only=(5, 6, 7)), - mobile=PhoneNumberDesc(national_number_pattern='(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}', example_number='501234567', possible_length=(9,)), + mobile=PhoneNumberDesc(national_number_pattern='790\\d{6}|(?:39|50|6[36-8]|7[1-357]|9[1-9])\\d{7}', example_number='501234567', possible_length=(9,)), toll_free=PhoneNumberDesc(national_number_pattern='800[1-8]\\d{5,6}', example_number='800123456', possible_length=(9, 10)), premium_rate=PhoneNumberDesc(national_number_pattern='900[239]\\d{5,6}', example_number='900212345', possible_length=(9, 10)), voip=PhoneNumberDesc(national_number_pattern='89[1-579]\\d{6}', example_number='891234567', possible_length=(9,)), diff --git a/python/phonenumbers/data/region_UG.py b/python/phonenumbers/data/region_UG.py index 0885d363f..d4fdf0fb6 100644 --- a/python/phonenumbers/data/region_UG.py +++ b/python/phonenumbers/data/region_UG.py @@ -4,7 +4,7 @@ PHONE_METADATA_UG = PhoneMetadata(id='UG', country_code=256, international_prefix='00[057]', general_desc=PhoneNumberDesc(national_number_pattern='800\\d{6}|(?:[29]0|[347]\\d)\\d{7}', possible_length=(9,), possible_length_local_only=(5, 6, 7)), fixed_line=PhoneNumberDesc(national_number_pattern='20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|3[1-4]|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}', example_number='312345678', possible_length=(9,), possible_length_local_only=(5, 6, 7)), - mobile=PhoneNumberDesc(national_number_pattern='72(?:[48]0|6[01])\\d{5}|7(?:[015-8]\\d|20|36|4[0-5]|9[89])\\d{6}', example_number='712345678', possible_length=(9,)), + mobile=PhoneNumberDesc(national_number_pattern='72[48]0\\d{5}|7(?:[015-8]\\d|2[067]|36|4[0-5]|9[89])\\d{6}', example_number='712345678', possible_length=(9,)), toll_free=PhoneNumberDesc(national_number_pattern='800[1-3]\\d{5}', example_number='800123456', possible_length=(9,)), premium_rate=PhoneNumberDesc(national_number_pattern='90[1-3]\\d{6}', example_number='901123456', possible_length=(9,)), national_prefix='0', diff --git a/python/phonenumbers/geodata/data10.py b/python/phonenumbers/geodata/data10.py index 785acd268..a28413e1a 100644 --- a/python/phonenumbers/geodata/data10.py +++ b/python/phonenumbers/geodata/data10.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '61350416':{'en': 'Rufus River'}, '61350417':{'en': 'Scotia'}, '61350418':{'en': 'Wemen'}, '61350419':{'en': 'Wentworth'}, @@ -10018,5 +10019,4 @@ '61730397':{'en': 'Ipswich'}, '61730398':{'en': 'Redcliffe'}, '61730399':{'en': 'Redcliffe'}, - '6173040':{'en': 'Brisbane'}, } diff --git a/python/phonenumbers/geodata/data11.py b/python/phonenumbers/geodata/data11.py index c6ed3d31c..6fa214e2b 100644 --- a/python/phonenumbers/geodata/data11.py +++ b/python/phonenumbers/geodata/data11.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '6173040':{'en': 'Brisbane'}, '6173041':{'en': 'Brisbane'}, '6173042':{'en': 'Cleveland'}, '6173043':{'en': 'Beenleigh'}, @@ -10018,5 +10019,4 @@ '61753011':{'en': 'Upper Widgee'}, '61753012':{'en': 'Wolvi'}, '61753013':{'en': 'Woolooga'}, - '61753014':{'en': 'Cooroy'}, } diff --git a/python/phonenumbers/geodata/data12.py b/python/phonenumbers/geodata/data12.py index bad4b2dd1..c3f42d007 100644 --- a/python/phonenumbers/geodata/data12.py +++ b/python/phonenumbers/geodata/data12.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '61753014':{'en': 'Cooroy'}, '61753015':{'en': 'Kenilworth'}, '61753016':{'en': 'Nambour'}, '61753017':{'en': 'Noosaville'}, @@ -10018,5 +10019,4 @@ '61885909':{'en': 'Mallala'}, '61885910':{'en': 'Two Wells'}, '61885911':{'en': 'Windsor'}, - '61885912':{'en': 'Callington'}, } diff --git a/python/phonenumbers/geodata/data13.py b/python/phonenumbers/geodata/data13.py index 8907eaeae..a6b0874fc 100644 --- a/python/phonenumbers/geodata/data13.py +++ b/python/phonenumbers/geodata/data13.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '61885912':{'en': 'Callington'}, '61885913':{'en': 'Hartley'}, '61885914':{'en': 'Langhorne Creek'}, '61885915':{'en': 'Milang'}, @@ -10018,5 +10019,4 @@ '618993929':{'en': 'Arrowsmith'}, '61899393':{'en': 'Northampton'}, '618993938':{'en': 'Balla'}, - '618993939':{'en': 'Carnamah'}, } diff --git a/python/phonenumbers/geodata/data14.py b/python/phonenumbers/geodata/data14.py index c7d60878f..1349a0946 100644 --- a/python/phonenumbers/geodata/data14.py +++ b/python/phonenumbers/geodata/data14.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '618993939':{'en': 'Carnamah'}, '61899394':{'en': 'Northern Gully'}, '618993948':{'en': 'Carnamah West'}, '618993949':{'en': 'Carnarvon'}, @@ -10018,5 +10019,4 @@ '861308420':{'en': 'Xinxiang, Henan', 'zh': u('\u6cb3\u5357\u7701\u65b0\u4e61\u5e02')}, '861308421':{'en': 'Xinxiang, Henan', 'zh': u('\u6cb3\u5357\u7701\u65b0\u4e61\u5e02')}, '861308422':{'en': 'Hebi, Henan', 'zh': u('\u6cb3\u5357\u7701\u9e64\u58c1\u5e02')}, - '861308423':{'en': 'Hebi, Henan', 'zh': u('\u6cb3\u5357\u7701\u9e64\u58c1\u5e02')}, } diff --git a/python/phonenumbers/geodata/data15.py b/python/phonenumbers/geodata/data15.py index 5f4b318f4..4777a603b 100644 --- a/python/phonenumbers/geodata/data15.py +++ b/python/phonenumbers/geodata/data15.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861308423':{'en': 'Hebi, Henan', 'zh': u('\u6cb3\u5357\u7701\u9e64\u58c1\u5e02')}, '861308424':{'en': 'Kaifeng, Henan', 'zh': u('\u6cb3\u5357\u7701\u5f00\u5c01\u5e02')}, '861308425':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')}, '861308426':{'en': 'Luohe, Henan', 'zh': u('\u6cb3\u5357\u7701\u6f2f\u6cb3\u5e02')}, @@ -10018,5 +10019,4 @@ '861324942':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')}, '861324943':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, '861324944':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, - '861324945':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, } diff --git a/python/phonenumbers/geodata/data16.py b/python/phonenumbers/geodata/data16.py index ab73716a9..73ef75d53 100644 --- a/python/phonenumbers/geodata/data16.py +++ b/python/phonenumbers/geodata/data16.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861324945':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, '861324946':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, '861324947':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, '861324948':{'en': 'Shantou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c55\u5934\u5e02')}, @@ -10018,5 +10019,4 @@ '861341417':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')}, '861341418':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')}, '861341419':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')}, - '86134142':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, } diff --git a/python/phonenumbers/geodata/data17.py b/python/phonenumbers/geodata/data17.py index 6745c4f29..73e178278 100644 --- a/python/phonenumbers/geodata/data17.py +++ b/python/phonenumbers/geodata/data17.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '86134142':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, '86134143':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, '861341440':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, '861341441':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, @@ -10018,5 +10019,4 @@ '86136597':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')}, '86136598':{'en': 'Wuhan, Hubei', 'zh': u('\u6e56\u5317\u7701\u6b66\u6c49\u5e02')}, '86136599':{'en': 'Urumchi, Xinjiang', 'zh': u('\u65b0\u7586\u4e4c\u9c81\u6728\u9f50\u5e02')}, - '8613660':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, } diff --git a/python/phonenumbers/geodata/data18.py b/python/phonenumbers/geodata/data18.py index 1ad573e2b..5c304c59f 100644 --- a/python/phonenumbers/geodata/data18.py +++ b/python/phonenumbers/geodata/data18.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '8613660':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, '86136609':{'en': 'Zhaoqing, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8087\u5e86\u5e02')}, '8613661':{'en': 'Shanghai', 'zh': u('\u4e0a\u6d77\u5e02')}, '86136610':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, @@ -10018,5 +10019,4 @@ '861396700':{'en': 'Quzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u8862\u5dde\u5e02')}, '861396701':{'en': 'Quzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u8862\u5dde\u5e02')}, '861396702':{'en': 'Quzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u8862\u5dde\u5e02')}, - '861396703':{'en': 'Quzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u8862\u5dde\u5e02')}, } diff --git a/python/phonenumbers/geodata/data19.py b/python/phonenumbers/geodata/data19.py index 7b20c9526..00b237977 100644 --- a/python/phonenumbers/geodata/data19.py +++ b/python/phonenumbers/geodata/data19.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861396703':{'en': 'Quzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u8862\u5dde\u5e02')}, '86139671':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')}, '86139672':{'en': 'Huzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u6e56\u5dde\u5e02')}, '861396720':{'en': 'Zhoushan, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u821f\u5c71\u5e02')}, @@ -10018,5 +10019,4 @@ '861508246':{'en': 'Yibin, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5b9c\u5bbe\u5e02')}, '861508247':{'en': 'Nanchong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5357\u5145\u5e02')}, '861508248':{'en': 'Nanchong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5357\u5145\u5e02')}, - '861508249':{'en': 'Nanchong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5357\u5145\u5e02')}, } diff --git a/python/phonenumbers/geodata/data20.py b/python/phonenumbers/geodata/data20.py index 4485872db..0e2fbfab0 100644 --- a/python/phonenumbers/geodata/data20.py +++ b/python/phonenumbers/geodata/data20.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861508249':{'en': 'Nanchong, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u5357\u5145\u5e02')}, '86150825':{'en': 'Suining, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u9042\u5b81\u5e02')}, '861508250':{'en': 'Aba, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u963f\u575d\u85cf\u65cf\u7f8c\u65cf\u81ea\u6cbb\u5dde')}, '861508251':{'en': 'Aba, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u963f\u575d\u85cf\u65cf\u7f8c\u65cf\u81ea\u6cbb\u5dde')}, @@ -10018,5 +10019,4 @@ '861534544':{'en': 'Liaocheng, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u804a\u57ce\u5e02')}, '861534545':{'en': 'Dezhou, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5fb7\u5dde\u5e02')}, '861534546':{'en': 'Dongying, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u4e1c\u8425\u5e02')}, - '861534547':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')}, } diff --git a/python/phonenumbers/geodata/data21.py b/python/phonenumbers/geodata/data21.py index 15e65f1b1..271a5bfab 100644 --- a/python/phonenumbers/geodata/data21.py +++ b/python/phonenumbers/geodata/data21.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861534547':{'en': 'Weihai, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5a01\u6d77\u5e02')}, '861534548':{'en': 'Rizhao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u65e5\u7167\u5e02')}, '861534549':{'en': 'Liaocheng, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u804a\u57ce\u5e02')}, '861534550':{'en': 'Chuzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u6ec1\u5dde\u5e02')}, @@ -10018,5 +10019,4 @@ '86156859':{'en': 'Qianxinan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u897f\u5357\u5e03\u4f9d\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')}, '861568590':{'en': 'Guiyang, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u8d35\u9633\u5e02')}, '861568591':{'en': 'Bijie, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u6bd5\u8282\u5730\u533a')}, - '861568592':{'en': 'Bijie, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u6bd5\u8282\u5730\u533a')}, } diff --git a/python/phonenumbers/geodata/data22.py b/python/phonenumbers/geodata/data22.py index d7029ebf3..47ea93d97 100644 --- a/python/phonenumbers/geodata/data22.py +++ b/python/phonenumbers/geodata/data22.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861568592':{'en': 'Bijie, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u6bd5\u8282\u5730\u533a')}, '86156860':{'en': 'XiAn, Shaanxi', 'zh': u('\u9655\u897f\u7701\u897f\u5b89\u5e02')}, '86156861':{'en': 'Xianyang, Shaanxi', 'zh': u('\u9655\u897f\u7701\u54b8\u9633\u5e02')}, '861568619':{'en': 'Hanzhong, Shaanxi', 'zh': u('\u9655\u897f\u7701\u6c49\u4e2d\u5e02')}, @@ -10018,5 +10019,4 @@ '861596082':{'en': 'Xiamen, Fujian', 'zh': u('\u798f\u5efa\u7701\u53a6\u95e8\u5e02')}, '861596083':{'en': 'Xiamen, Fujian', 'zh': u('\u798f\u5efa\u7701\u53a6\u95e8\u5e02')}, '861596084':{'en': 'Xiamen, Fujian', 'zh': u('\u798f\u5efa\u7701\u53a6\u95e8\u5e02')}, - '861596085':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')}, } diff --git a/python/phonenumbers/geodata/data23.py b/python/phonenumbers/geodata/data23.py index 47c26f294..2ce8ca446 100644 --- a/python/phonenumbers/geodata/data23.py +++ b/python/phonenumbers/geodata/data23.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861596085':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')}, '861596086':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')}, '861596087':{'en': 'Zhangzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6f33\u5dde\u5e02')}, '861596088':{'en': 'Longyan, Fujian', 'zh': u('\u798f\u5efa\u7701\u9f99\u5ca9\u5e02')}, @@ -10018,5 +10019,4 @@ '861787840':{'en': 'Wuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u68a7\u5dde\u5e02')}, '861787841':{'en': 'Wuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u68a7\u5dde\u5e02')}, '861787842':{'en': 'Wuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u68a7\u5dde\u5e02')}, - '861787843':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, } diff --git a/python/phonenumbers/geodata/data24.py b/python/phonenumbers/geodata/data24.py index d1e9cfa84..4199216ad 100644 --- a/python/phonenumbers/geodata/data24.py +++ b/python/phonenumbers/geodata/data24.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861787843':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, '861787844':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, '861787845':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, '861787846':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, @@ -10018,5 +10019,4 @@ '861820974':{'en': 'Hainan, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u5357\u85cf\u65cf\u81ea\u6cbb\u5dde')}, '861820975':{'en': 'Golog, Qinghai', 'zh': u('\u9752\u6d77\u7701\u679c\u6d1b\u85cf\u65cf\u81ea\u6cbb\u5dde')}, '861820976':{'en': 'Yushu, Qinghai', 'zh': u('\u9752\u6d77\u7701\u7389\u6811\u85cf\u65cf\u81ea\u6cbb\u5dde')}, - '861820977':{'en': 'Haixi, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u897f\u8499\u53e4\u65cf\u85cf\u65cf\u81ea\u6cbb\u5dde')}, } diff --git a/python/phonenumbers/geodata/data25.py b/python/phonenumbers/geodata/data25.py index 4b0b6bc5b..1106d4aba 100644 --- a/python/phonenumbers/geodata/data25.py +++ b/python/phonenumbers/geodata/data25.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861820977':{'en': 'Haixi, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u897f\u8499\u53e4\u65cf\u85cf\u65cf\u81ea\u6cbb\u5dde')}, '861820978':{'en': 'Xining, Qinghai', 'zh': u('\u9752\u6d77\u7701\u897f\u5b81\u5e02')}, '861820979':{'en': 'Haixi, Qinghai', 'zh': u('\u9752\u6d77\u7701\u6d77\u897f\u8499\u53e4\u65cf\u85cf\u65cf\u81ea\u6cbb\u5dde')}, '86182098':{'en': 'Zunyi, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9075\u4e49\u5e02')}, @@ -10018,5 +10019,4 @@ '861856928':{'en': 'Shaoyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u90b5\u9633\u5e02')}, '861856929':{'en': 'Shaoyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u90b5\u9633\u5e02')}, '861856930':{'en': 'Shaoyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u90b5\u9633\u5e02')}, - '861856931':{'en': 'Loudi, Hunan', 'zh': u('\u6e56\u5357\u7701\u5a04\u5e95\u5e02')}, } diff --git a/python/phonenumbers/geodata/data26.py b/python/phonenumbers/geodata/data26.py index 4eb0f7f2a..f3d94dcae 100644 --- a/python/phonenumbers/geodata/data26.py +++ b/python/phonenumbers/geodata/data26.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861856931':{'en': 'Loudi, Hunan', 'zh': u('\u6e56\u5357\u7701\u5a04\u5e95\u5e02')}, '861856932':{'en': 'Loudi, Hunan', 'zh': u('\u6e56\u5357\u7701\u5a04\u5e95\u5e02')}, '861856933':{'en': 'Loudi, Hunan', 'zh': u('\u6e56\u5357\u7701\u5a04\u5e95\u5e02')}, '861856934':{'en': 'Loudi, Hunan', 'zh': u('\u6e56\u5357\u7701\u5a04\u5e95\u5e02')}, @@ -10018,5 +10019,4 @@ '86188388':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')}, '86188389':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, '86188390':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')}, - '86188391':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')}, } diff --git a/python/phonenumbers/geodata/data27.py b/python/phonenumbers/geodata/data27.py index d4d74ace5..632650a4f 100644 --- a/python/phonenumbers/geodata/data27.py +++ b/python/phonenumbers/geodata/data27.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '86188391':{'en': 'Jiaozuo, Henan', 'zh': u('\u6cb3\u5357\u7701\u7126\u4f5c\u5e02')}, '86188392':{'en': 'Hebi, Henan', 'zh': u('\u6cb3\u5357\u7701\u9e64\u58c1\u5e02')}, '86188393':{'en': 'Puyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6fee\u9633\u5e02')}, '86188394':{'en': 'Zhoukou, Henan', 'zh': u('\u6cb3\u5357\u7701\u5468\u53e3\u5e02')}, @@ -10018,5 +10019,4 @@ '9171854':{'en': 'Pauni, Maharashtra'}, '9171855':{'en': 'Pauni, Maharashtra'}, '9171856':{'en': 'Pauni, Maharashtra'}, - '9171857':{'en': 'Pauni, Maharashtra'}, } diff --git a/python/phonenumbers/geodata/data28.py b/python/phonenumbers/geodata/data28.py index c3a251ca8..9049ed657 100644 --- a/python/phonenumbers/geodata/data28.py +++ b/python/phonenumbers/geodata/data28.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '9171857':{'en': 'Pauni, Maharashtra'}, '9171862':{'en': 'Sakoli, Maharashtra'}, '9171863':{'en': 'Sakoli, Maharashtra'}, '9171864':{'en': 'Sakoli, Maharashtra'}, @@ -2916,6 +2917,7 @@ '9467':{'en': 'Kalmunai, Ampara'}, '9482':{'en': 'Kandy'}, '9491':{'en': 'Galle'}, + '9511':{'en': 'Yangon'}, '951422':{'en': 'Yangon'}, '951423':{'en': 'Yangon'}, '951424':{'en': 'Yangon'}, diff --git a/python/phonenumbers/geodata/data3.py b/python/phonenumbers/geodata/data3.py index c1a7a959b..7b997f7df 100644 --- a/python/phonenumbers/geodata/data3.py +++ b/python/phonenumbers/geodata/data3.py @@ -4432,6 +4432,7 @@ '26120729':{'en': 'Mananjary'}, '2612073':{'en': 'Farafangana'}, '2612075':{'en': 'Fianarantsoa'}, + '2612076':{'en': 'Antananarivo'}, '2612082':{'en': 'Antsiranana'}, '2612086':{'en': 'Nosy Be'}, '2612088':{'en': 'Sambava'}, @@ -10018,5 +10019,4 @@ '3323598':{'en': 'Rouen', 'fr': 'Rouen'}, '3323600':{'en': 'Tours', 'fr': 'Tours'}, '3323601':{'en': u('La Ch\u00e2tre'), 'fr': u('La Ch\u00e2tre')}, - '3323602':{'en': u('Valen\u00e7ay'), 'fr': u('Valen\u00e7ay')}, } diff --git a/python/phonenumbers/geodata/data4.py b/python/phonenumbers/geodata/data4.py index 7022814c3..b96e03928 100644 --- a/python/phonenumbers/geodata/data4.py +++ b/python/phonenumbers/geodata/data4.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '3323602':{'en': u('Valen\u00e7ay'), 'fr': u('Valen\u00e7ay')}, '3323603':{'en': 'Amboise', 'fr': 'Amboise'}, '3323604':{'en': 'Chinon', 'fr': 'Chinon'}, '3323605':{'en': 'Loches', 'fr': 'Loches'}, @@ -10018,5 +10019,4 @@ '3358694':{'en': 'Thouars', 'fr': 'Thouars'}, '3358695':{'en': 'Civray', 'fr': 'Civray'}, '3358696':{'en': 'Loudun', 'fr': 'Loudun'}, - '3358697':{'en': 'Montmorillon', 'fr': 'Montmorillon'}, } diff --git a/python/phonenumbers/geodata/data5.py b/python/phonenumbers/geodata/data5.py index 258efbec2..1d80bb30c 100644 --- a/python/phonenumbers/geodata/data5.py +++ b/python/phonenumbers/geodata/data5.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '3358697':{'en': 'Montmorillon', 'fr': 'Montmorillon'}, '3358698':{'en': 'Poitiers', 'fr': 'Poitiers'}, '3358699':{'en': 'Niort', 'fr': 'Niort'}, '3358700':{'en': 'Limoges', 'fr': 'Limoges'}, @@ -4388,7 +4389,7 @@ '3804741':{'en': 'Shpola, Cherkasy', 'uk': u('\u0428\u043f\u043e\u043b\u0430, \u0427\u0435\u0440\u043a\u0430\u0441\u0438')}, '3804742':{'en': 'Katerinopil, Cherkasy', 'uk': u('\u041a\u0430\u0442\u0435\u0440\u0438\u043d\u043e\u043f\u0456\u043b\u044c, \u0427\u0435\u0440\u043a\u0430\u0441\u0438')}, '3804744':{'en': 'Uman, Cherkasy', 'uk': u('\u0423\u043c\u0430\u043d\u044c, \u0427\u0435\u0440\u043a\u0430\u0441\u0438')}, - '3804745':{'en': 'Khrystynivka, Cherkasy', 'uk': u('\u0425\u0440\u0438\u0441\u0442\u0438\u043d\u0456\u0432\u043a\u0430, \u0427\u0435\u0440\u043a\u0430\u0441\u0438')}, + '3804745':{'en': 'Monastyrysche, Cherkasy', 'uk': u('\u041c\u043e\u043d\u0430\u0441\u0442\u0438\u0440\u0438\u0449\u0435, \u0427\u0435\u0440\u043a\u0430\u0441\u0438')}, '3804746':{'en': 'Monastyrysche, Cherkasy', 'uk': u('\u041c\u043e\u043d\u0430\u0441\u0442\u0438\u0440\u0438\u0449\u0435, \u0427\u0435\u0440\u043a\u0430\u0441\u0438')}, '3804747':{'en': 'Zhashkiv, Cherkasy', 'uk': u('\u0416\u0430\u0448\u043a\u0456\u0432, \u0427\u0435\u0440\u043a\u0430\u0441\u0438')}, '3804748':{'en': 'Mankivka, Cherkasy', 'uk': u('\u041c\u0430\u043d\u044c\u043a\u0456\u0432\u043a\u0430, \u0427\u0435\u0440\u043a\u0430\u0441\u0438')}, @@ -10018,5 +10019,4 @@ '494804':{'de': 'Nordhastedt', 'en': 'Nordhastedt'}, '494805':{'de': 'Schafstedt', 'en': 'Schafstedt'}, '494806':{'de': u('Sarzb\u00fcttel'), 'en': u('Sarzb\u00fcttel')}, - '49481':{'de': 'Heide Holstein', 'en': 'Heide Holstein'}, } diff --git a/python/phonenumbers/geodata/data6.py b/python/phonenumbers/geodata/data6.py index 496fcf975..e776fd3d5 100644 --- a/python/phonenumbers/geodata/data6.py +++ b/python/phonenumbers/geodata/data6.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '49481':{'de': 'Heide Holstein', 'en': 'Heide Holstein'}, '494821':{'de': 'Itzehoe', 'en': 'Itzehoe'}, '494822':{'de': 'Kellinghusen', 'en': 'Kellinghusen'}, '494823':{'de': 'Wilster', 'en': 'Wilster'}, @@ -10018,5 +10019,4 @@ '55493354':{'en': 'Marema - SC', 'pt': 'Marema - SC'}, '55493355':{'en': 'Lajeado Grande - SC', 'pt': 'Lajeado Grande - SC'}, '55493356':{'en': 'Arvoredo - SC', 'pt': 'Arvoredo - SC'}, - '55493358':{'en': 'Cordilheira Alta - SC', 'pt': 'Cordilheira Alta - SC'}, } diff --git a/python/phonenumbers/geodata/data7.py b/python/phonenumbers/geodata/data7.py index c1b33b31d..9d7a666e1 100644 --- a/python/phonenumbers/geodata/data7.py +++ b/python/phonenumbers/geodata/data7.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '55493358':{'en': 'Cordilheira Alta - SC', 'pt': 'Cordilheira Alta - SC'}, '55493361':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, '55493362':{'en': 'Novo Horizonte - SC', 'pt': 'Novo Horizonte - SC'}, '55493363':{'en': 'Bom Jesus do Oeste - SC', 'pt': 'Bom Jesus do Oeste - SC'}, @@ -10018,5 +10019,4 @@ '609719':{'en': 'Kota Bharu'}, '609721':{'en': 'Kota Bharu'}, '609725':{'en': 'Kota Bharu'}, - '609726':{'en': 'Kota Bharu'}, } diff --git a/python/phonenumbers/geodata/data8.py b/python/phonenumbers/geodata/data8.py index 8f8cbecda..d0e10f7a3 100644 --- a/python/phonenumbers/geodata/data8.py +++ b/python/phonenumbers/geodata/data8.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '609726':{'en': 'Kota Bharu'}, '609732':{'en': 'Kota Bharu'}, '609735':{'en': 'Kota Bharu'}, '609738':{'en': 'Kota Bharu'}, @@ -10018,5 +10019,4 @@ '61263815':{'en': 'Young'}, '61263816':{'en': 'Koorawatha'}, '61263817':{'en': 'Merriganowry'}, - '61263818':{'en': 'Ooma'}, } diff --git a/python/phonenumbers/geodata/data9.py b/python/phonenumbers/geodata/data9.py index 662735806..c8d483d64 100644 --- a/python/phonenumbers/geodata/data9.py +++ b/python/phonenumbers/geodata/data9.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '61263818':{'en': 'Ooma'}, '61263819':{'en': 'Quandialla'}, '6126382':{'en': 'Young'}, '61263830':{'en': 'Bribbaree'}, @@ -10018,5 +10019,4 @@ '61350413':{'en': 'Pan Ban'}, '61350414':{'en': 'Pooncarie'}, '61350415':{'en': 'Robinvale'}, - '61350416':{'en': 'Rufus River'}, } diff --git a/python/phonenumbers/shortdata/region_NO.py b/python/phonenumbers/shortdata/region_NO.py index 577a28bf7..576cd0861 100644 --- a/python/phonenumbers/shortdata/region_NO.py +++ b/python/phonenumbers/shortdata/region_NO.py @@ -2,8 +2,9 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata PHONE_METADATA_NO = PhoneMetadata(id='NO', country_code=None, international_prefix=None, - general_desc=PhoneNumberDesc(national_number_pattern='1\\d\\d(?:\\d(?:\\d{2})?)?', possible_length=(3, 4, 6)), + general_desc=PhoneNumberDesc(national_number_pattern='[01]\\d{2,5}', possible_length=(3, 4, 5, 6)), toll_free=PhoneNumberDesc(national_number_pattern='11(?:[023]|6\\d{3})', example_number='110', possible_length=(3, 6)), emergency=PhoneNumberDesc(national_number_pattern='11[023]', example_number='110', possible_length=(3,)), - short_code=PhoneNumberDesc(national_number_pattern='1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|8[5-9]\\d|90)', example_number='110', possible_length=(3, 4, 6)), + short_code=PhoneNumberDesc(national_number_pattern='04\\d{3}|1(?:1(?:[0239]|61(?:1[17]|23))|2[048]|4(?:12|[59])|7[57]|8[5-9]\\d|90)', example_number='110', possible_length=(3, 4, 5, 6)), + sms_services=PhoneNumberDesc(national_number_pattern='04\\d{3}', example_number='04000', possible_length=(5,)), short_data=True) diff --git a/python/phonenumbers/shortdata/region_SJ.py b/python/phonenumbers/shortdata/region_SJ.py index 1b097b353..25e53b8b4 100644 --- a/python/phonenumbers/shortdata/region_SJ.py +++ b/python/phonenumbers/shortdata/region_SJ.py @@ -2,8 +2,9 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata PHONE_METADATA_SJ = PhoneMetadata(id='SJ', country_code=None, international_prefix=None, - general_desc=PhoneNumberDesc(national_number_pattern='1\\d\\d', possible_length=(3,)), + general_desc=PhoneNumberDesc(national_number_pattern='[01]\\d\\d(?:\\d{2})?', possible_length=(3, 5)), toll_free=PhoneNumberDesc(national_number_pattern='11[023]', example_number='110', possible_length=(3,)), emergency=PhoneNumberDesc(national_number_pattern='11[023]', example_number='110', possible_length=(3,)), - short_code=PhoneNumberDesc(national_number_pattern='11[023]', example_number='110', possible_length=(3,)), + short_code=PhoneNumberDesc(national_number_pattern='04\\d{3}|11[023]', example_number='110', possible_length=(3, 5)), + sms_services=PhoneNumberDesc(national_number_pattern='04\\d{3}', example_number='04000', possible_length=(5,)), short_data=True)