diff --git a/python/phonenumbers/carrierdata/data0.py b/python/phonenumbers/carrierdata/data0.py index f0502014..a8b78559 100644 --- a/python/phonenumbers/carrierdata/data0.py +++ b/python/phonenumbers/carrierdata/data0.py @@ -493,10 +493,6 @@ '180999':{'en': 'Tricom'}, '186825':{'en': 'Digicel'}, '186826':{'en': 'Digicel'}, - '1868266':{'en': 'bmobile'}, - '1868267':{'en': 'bmobile'}, - '1868268':{'en': 'bmobile'}, - '1868269':{'en': 'bmobile'}, '186827':{'en': 'bmobile'}, '186828':{'en': 'bmobile'}, '186829':{'en': 'bmobile'}, @@ -2705,6 +2701,7 @@ '3584323':{'en': 'Top Connect OU'}, '3584324':{'en': 'Nord Connect SIA'}, '3584325':{'en': 'NETTIA'}, + '3584326':{'en': 'Lancelot'}, '358436':{'en': 'DNA'}, '358438':{'en': 'DNA'}, '35844':{'en': 'DNA'}, @@ -3393,7 +3390,8 @@ '3938':{'en': 'WIND'}, '39383':{'en': 'Vodafone'}, '3939':{'en': '3 Italia'}, - '406':{'en': 'Vodafone'}, + '4062':{'en': 'Vodafone'}, + '4064':{'en': 'Orange'}, '407000':{'en': 'Enigma-System'}, '407013':{'en': 'Lycamobile'}, '407014':{'en': 'Lycamobile'}, @@ -6966,6 +6964,7 @@ '48887':{'en': 'Plus'}, '48888':{'en': 'T-Mobile'}, '48889':{'en': 'T-Mobile'}, + '4915019':{'en': 'Tismi BV'}, '4915020':{'en': 'Interactive digital media'}, '4915050':{'en': 'NAKA AG'}, '4915080':{'en': 'Easy World'}, @@ -6977,7 +6976,9 @@ '491525':{'en': 'Vodafone'}, '491526':{'en': 'Vodafone'}, '491529':{'en': 'Vodafone/Truphone'}, - '4915555':{'en': 'Tismi BV'}, + '491531':{'en': 'Mtel'}, + '4915510':{'en': 'LEBARA'}, + '4915511':{'en': 'LEBARA'}, '491556':{'en': '1&1 Mobilfunk'}, '4915630':{'en': 'Multiconnect'}, '4915678':{'en': 'Argon Networks'}, @@ -10018,5 +10019,4 @@ '553199607':{'en': 'Telemig Celular'}, '553199608':{'en': 'Telemig Celular'}, '553199609':{'en': 'Telemig Celular'}, - '553199611':{'en': 'Telemig Celular'}, } diff --git a/python/phonenumbers/carrierdata/data1.py b/python/phonenumbers/carrierdata/data1.py index 85cc95db..61a622c5 100644 --- a/python/phonenumbers/carrierdata/data1.py +++ b/python/phonenumbers/carrierdata/data1.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '553199611':{'en': 'Telemig Celular'}, '553199612':{'en': 'Telemig Celular'}, '553199613':{'en': 'Telemig Celular'}, '553199614':{'en': 'Telemig Celular'}, @@ -10018,5 +10019,4 @@ '5699969':{'en': 'Entel'}, '5699970':{'en': 'Movistar'}, '5699971':{'en': 'Movistar'}, - '5699972':{'en': 'Movistar'}, } diff --git a/python/phonenumbers/carrierdata/data2.py b/python/phonenumbers/carrierdata/data2.py index dae652a8..6aac3d72 100644 --- a/python/phonenumbers/carrierdata/data2.py +++ b/python/phonenumbers/carrierdata/data2.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '5699972':{'en': 'Movistar'}, '5699973':{'en': 'Movistar'}, '5699974':{'en': 'Movistar'}, '5699975':{'en': 'Claro'}, @@ -541,6 +542,7 @@ '595984':{'en': 'Tigo'}, '595985':{'en': 'Tigo'}, '595986':{'en': 'Tigo'}, + '595987':{'en': 'Tigo'}, '59599':{'en': 'Claro'}, '5966960':{'en': 'SFR/Rife'}, '59669610':{'en': 'Digicel'}, @@ -1244,9 +1246,9 @@ '65807':{'en': 'Simba'}, '658070':{'en': 'SingTel'}, '658071':{'en': 'SingTel'}, - '658080':{'en': 'Simba'}, - '658081':{'en': 'Simba'}, + '65808':{'en': 'Simba'}, '658083':{'en': 'M1'}, + '658084':{'en': 'SingTel'}, '6581':{'en': 'StarHub'}, '65810':{'en': 'M1'}, '65812':{'en': 'SingTel'}, @@ -2269,6 +2271,7 @@ '67371':{'en': 'DSTCom'}, '67372':{'en': 'DSTCom'}, '67373':{'en': 'DSTCom'}, + '67374':{'en': 'Imagine'}, '67377':{'en': 'DSTCom'}, '67381':{'en': 'Progresif Cellular'}, '67382':{'en': 'Progresif Cellular'}, @@ -3946,6 +3949,7 @@ '852441':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')}, '852444':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')}, '852445':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')}, + '852446':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')}, '852460':{'en': 'China Unicom', 'zh': u('\u4e2d\u56fd\u8054\u901a'), 'zh_Hant': u('\u4e2d\u570b\u79fb\u52d5')}, '8524607':{'en': 'Multibyte', 'zh': 'Multibyte'}, '8524608':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')}, @@ -4221,6 +4225,7 @@ '8527075':{'en': 'SmarTone', 'zh': u('\u6570\u7801\u901a')}, '8527076':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')}, '852708':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf')}, + '852709':{'en': 'Hutchison Telecom.', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')}, '852840':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')}, '8528480':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf'), 'zh_Hant': 'Handy'}, '8528481':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf'), 'zh_Hant': u('\u65b0\u79fb\u52d5\u901a\u8a0a')}, @@ -8459,6 +8464,8 @@ '9736674':{'en': 'Batelco'}, '9736675':{'en': 'Batelco'}, '9736676':{'en': 'Batelco'}, + '9736678':{'en': 'Batelco'}, + '9736679':{'en': 'Batelco'}, '973669':{'en': 'zain BH'}, '97430':{'en': 'Vodafone'}, '974310':{'en': 'Vodafone'}, @@ -8608,9 +8615,29 @@ '9946':{'en': 'Naxtel'}, '9947':{'en': 'Nar Mobile'}, '99499':{'en': 'Bakcell'}, - '995500':{'en': 'Silknet'}, + '99550001':{'en': 'Cellfie'}, + '995500050':{'en': 'Silknet'}, + '995500051':{'en': 'Silknet'}, + '995500052':{'en': 'Silknet'}, + '995500053':{'en': 'Silknet'}, + '995500054':{'en': 'Silknet'}, + '995500055':{'en': 'Cellfie'}, + '995500056':{'en': 'Cellfie'}, + '995500057':{'en': 'Cellfie'}, + '995500058':{'en': 'Cellfie'}, + '995500059':{'en': 'Cellfie'}, + '99550010':{'en': 'Cellfie'}, + '99550011':{'en': 'Silknet'}, + '9955002':{'en': 'Silknet'}, + '9955003':{'en': 'Silknet'}, + '9955004':{'en': 'Silknet'}, '99550050':{'en': 'MagtiCom'}, - '99550070':{'en': 'MyPhone'}, + '99550055':{'en': 'Silknet'}, + '99550070':{'en': 'Cellfie'}, + '99550077':{'en': 'Silknet'}, + '9955008':{'en': 'Silknet'}, + '99550090':{'en': 'Cellfie'}, + '99550099':{'en': 'Silknet'}, '9955050':{'en': 'Silknet'}, '9955055':{'en': 'MagtiCom'}, '995510':{'en': 'Silknet'}, @@ -8652,27 +8679,27 @@ '995559997':{'en': 'DataHouse Global'}, '995559998':{'en': 'DataHouse Global'}, '995559999':{'en': 'DataHouse Global'}, - '99556':{'en': 'Veon'}, + '99556':{'en': 'Cellfie'}, '995570':{'en': 'Silknet'}, - '995571':{'en': 'Veon'}, - '995574':{'en': 'Veon'}, + '995571':{'en': 'Cellfie'}, + '995574':{'en': 'Cellfie'}, '9955750':{'en': 'Asanet'}, '9955755':{'en': 'Silknet'}, '99557575':{'en': 'Silknet'}, '99557577':{'en': 'MagtiCom'}, '99557578':{'en': 'MagtiCom'}, '995577':{'en': 'Silknet'}, - '995579':{'en': 'Veon'}, + '995579':{'en': 'Cellfie'}, '995580':{'en': 'Silknet'}, '995585':{'en': 'MagtiCom'}, '995588':{'en': 'Silknet'}, '995590':{'en': 'Silknet'}, '995591':{'en': 'MagtiCom'}, - '995592':{'en': 'Veon'}, + '995592':{'en': 'Cellfie'}, '995593':{'en': 'Silknet'}, '995595':{'en': 'MagtiCom'}, '995596':{'en': 'MagtiCom'}, - '995597':{'en': 'Veon'}, + '995597':{'en': 'Cellfie'}, '995598':{'en': 'MagtiCom'}, '995599':{'en': 'MagtiCom'}, '99579':{'en': 'MagtiCom'}, diff --git a/python/phonenumbers/data/region_AR.py b/python/phonenumbers/data/region_AR.py index 25025d89..372cd28e 100644 --- a/python/phonenumbers/data/region_AR.py +++ b/python/phonenumbers/data/region_AR.py @@ -3,8 +3,8 @@ PHONE_METADATA_AR = PhoneMetadata(id='AR', country_code=54, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='(?:11|[89]\\d\\d)\\d{8}|[2368]\\d{9}', possible_length=(10, 11), possible_length_local_only=(6, 7, 8)), - fixed_line=PhoneNumberDesc(national_number_pattern='3888[013-9]\\d{5}|3(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|(?:29(?:54|66)|3(?:7(?:55|77)|865))[2-8]\\d{5}|(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|(?:2(?:284|3(?:02|23)|657|920)|3(?:4(?:8[27]|92)|541|878))[2-7]\\d{5}|(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:[47]6|62|89)|564))[2-6]\\d{5}|(?:(?:11[1-8]|670)\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[235][4-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|[58][3-6])))\\d{6}|2(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|5[17])))[3-6]\\d{5}|(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[145]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}', example_number='1123456789', possible_length=(10,), possible_length_local_only=(6, 7, 8)), - mobile=PhoneNumberDesc(national_number_pattern='93(?:7(?:1[15]|81)[46]|8(?:(?:21|4[16]|69|9[12])[46]|88[013-9]))\\d{5}|9(?:29(?:54|66)|3(?:7(?:55|77)|865))[2-8]\\d{5}|9(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|9(?:2(?:284|3(?:02|23)|657|920)|3(?:4(?:8[27]|92)|541|878))[2-7]\\d{5}|9(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:[47]6|62|89)|564))[2-6]\\d{5}|(?:675\\d|9(?:11[1-8]\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[235][4-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|[58][3-6]))))\\d{6}|92(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|9(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|5[17])))[3-6]\\d{5}|9(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[145]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}', example_number='91123456789', possible_length=(10, 11), possible_length_local_only=(6, 7, 8)), + fixed_line=PhoneNumberDesc(national_number_pattern='3888[013-9]\\d{5}|3(?:7(?:1[15]|81)|8(?:21|4[16]|69|9[12]))[46]\\d{5}|(?:2(?:657|9(?:54|66))|3(?:7(?:55|77)|865))[2-8]\\d{5}|(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|(?:2(?:284|3(?:02|23)|920)|3(?:4(?:46|8[27]|92)|541|878))[2-7]\\d{5}|(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:(?:11[1-8]|670)\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[235][4-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|[58][3-6])))\\d{6}|2(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|5[17])))[3-6]\\d{5}|(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[145]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}', example_number='1123456789', possible_length=(10,), possible_length_local_only=(6, 7, 8)), + mobile=PhoneNumberDesc(national_number_pattern='93(?:7(?:1[15]|81)[46]|8(?:(?:21|4[16]|69|9[12])[46]|88[013-9]))\\d{5}|9(?:2(?:657|9(?:54|66))|3(?:7(?:55|77)|865))[2-8]\\d{5}|9(?:2(?:2(?:2[59]|44|52)|3(?:26|44)|473|9(?:[07]2|2[26]|34|46))|3327)[45]\\d{5}|9(?:2(?:284|3(?:02|23)|920)|3(?:4(?:46|8[27]|92)|541|878))[2-7]\\d{5}|9(?:2(?:(?:26|62)2|320|477|9(?:42|83))|3(?:329|4(?:62|76|89)|564))[2-6]\\d{5}|(?:675\\d|9(?:11[1-8]\\d|2(?:2(?:0[45]|1[2-6]|3[3-6])|3(?:[06]4|7[45])|494|6(?:04|1[2-8]|[36][45]|4[3-6])|80[45]|9(?:[17][4-6]|[48][45]|9[3-6]))|3(?:364|4(?:1[2-8]|[235][4-6]|84)|5(?:1[2-9]|[38][4-6])|6(?:2[45]|44)|7[069][45]|8(?:0[45]|[17][2-6]|3[4-6]|[58][3-6]))))\\d{6}|92(?:2(?:21|4[23]|6[145]|7[1-4]|8[356]|9[267])|3(?:16|3[13-8]|43|5[346-8]|9[3-5])|475|6(?:2[46]|4[78]|5[1568])|9(?:03|2[1457-9]|3[1356]|4[08]|[56][23]|82))4\\d{5}|9(?:2(?:2(?:57|81)|3(?:24|46|92)|9(?:01|23|64))|3(?:4(?:42|71)|5(?:25|37|4[347]|71)|7(?:18|5[17])))[3-6]\\d{5}|9(?:2(?:2(?:02|2[3467]|4[156]|5[45]|6[6-8]|91)|3(?:1[47]|25|[45][25]|96)|47[48]|625|932)|3(?:38[2578]|4(?:0[0-24-9]|3[78]|4[457]|58|6[03-9]|72|83|9[136-8])|5(?:2[124]|[368][23]|4[2689]|7[2-6])|7(?:16|2[15]|3[145]|4[13]|5[468]|7[2-5]|8[26])|8(?:2[5-7]|3[278]|4[3-5]|5[78]|6[1-378]|[78]7|94)))[4-6]\\d{5}', example_number='91123456789', possible_length=(10, 11), possible_length_local_only=(6, 7, 8)), toll_free=PhoneNumberDesc(national_number_pattern='800\\d{7,8}', example_number='8001234567', possible_length=(10, 11)), premium_rate=PhoneNumberDesc(national_number_pattern='60[04579]\\d{7}', example_number='6001234567', possible_length=(10,)), uan=PhoneNumberDesc(national_number_pattern='810\\d{7}', example_number='8101234567', possible_length=(10,)), diff --git a/python/phonenumbers/data/region_BH.py b/python/phonenumbers/data/region_BH.py index c6d41009..8c4941b2 100644 --- a/python/phonenumbers/data/region_BH.py +++ b/python/phonenumbers/data/region_BH.py @@ -4,7 +4,7 @@ PHONE_METADATA_BH = PhoneMetadata(id='BH', country_code=973, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='[136-9]\\d{7}', possible_length=(8,)), fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:3[1356]|6[0156]|7\\d)\\d|6(?:1[16]\\d|500|6(?:0\\d|3[12]|44|55|7[7-9]|88)|9[69][69])|7(?:[07]\\d\\d|1(?:11|78)))\\d{4}', example_number='17001234', possible_length=(8,)), - mobile=PhoneNumberDesc(national_number_pattern='(?:3(?:[0-79]\\d|8[0-57-9])\\d|6(?:3(?:00|33|6[16])|441|6(?:3[03-9]|[69]\\d|7[0-6])))\\d{4}', example_number='36001234', possible_length=(8,)), + mobile=PhoneNumberDesc(national_number_pattern='(?:3(?:[0-79]\\d|8[0-57-9])\\d|6(?:3(?:00|33|6[16])|441|6(?:3[03-9]|[69]\\d|7[0-689])))\\d{4}', example_number='36001234', possible_length=(8,)), toll_free=PhoneNumberDesc(national_number_pattern='8[02369]\\d{6}', example_number='80123456', possible_length=(8,)), premium_rate=PhoneNumberDesc(national_number_pattern='(?:87|9[0-8])\\d{6}', example_number='90123456', possible_length=(8,)), shared_cost=PhoneNumberDesc(national_number_pattern='84\\d{6}', example_number='84123456', possible_length=(8,)), diff --git a/python/phonenumbers/data/region_DE.py b/python/phonenumbers/data/region_DE.py index 59383ff5..8c4d35dc 100644 --- a/python/phonenumbers/data/region_DE.py +++ b/python/phonenumbers/data/region_DE.py @@ -4,7 +4,7 @@ PHONE_METADATA_DE = PhoneMetadata(id='DE', country_code=49, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='[2579]\\d{5,14}|49(?:[34]0|69|8\\d)\\d\\d?|49(?:37|49|60|7[089]|9\\d)\\d{1,3}|49(?:2[024-9]|3[2-689]|7[1-7])\\d{1,8}|(?:1|[368]\\d|4[0-8])\\d{3,13}|49(?:[015]\\d|2[13]|31|[46][1-8])\\d{1,9}', possible_length=(4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15), possible_length_local_only=(2, 3)), fixed_line=PhoneNumberDesc(national_number_pattern='32\\d{9,11}|49[1-6]\\d{10}|322\\d{6}|49[0-7]\\d{3,9}|(?:[34]0|[68]9)\\d{3,13}|(?:2(?:0[1-689]|[1-3569]\\d|4[0-8]|7[1-7]|8[0-7])|3(?:[3569]\\d|4[0-79]|7[1-7]|8[1-8])|4(?:1[02-9]|[2-48]\\d|5[0-6]|6[0-8]|7[0-79])|5(?:0[2-8]|[124-6]\\d|[38][0-8]|[79][0-7])|6(?:0[02-9]|[1-358]\\d|[47][0-8]|6[1-9])|7(?:0[2-8]|1[1-9]|[27][0-7]|3\\d|[4-6][0-8]|8[0-5]|9[013-7])|8(?:0[2-9]|1[0-79]|2\\d|3[0-46-9]|4[0-6]|5[013-9]|6[1-8]|7[0-8]|8[0-24-6])|9(?:0[6-9]|[1-4]\\d|[589][0-7]|6[0-8]|7[0-467]))\\d{3,12}', example_number='30123456', possible_length=(5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15), possible_length_local_only=(2, 3, 4)), - mobile=PhoneNumberDesc(national_number_pattern='15[0-25-9]\\d{8}|1(?:6[023]|7\\d)\\d{7,8}', example_number='15123456789', possible_length=(10, 11)), + mobile=PhoneNumberDesc(national_number_pattern='15(?:[0-25-9]\\d\\d|310)\\d{6}|1(?:6[023]|7\\d)\\d{7,8}', example_number='15123456789', possible_length=(10, 11)), toll_free=PhoneNumberDesc(national_number_pattern='800\\d{7,12}', example_number='8001234567890', possible_length=(10, 11, 12, 13, 14, 15)), premium_rate=PhoneNumberDesc(national_number_pattern='(?:137[7-9]|900(?:[135]|9\\d))\\d{6}', example_number='9001234567', possible_length=(10, 11)), shared_cost=PhoneNumberDesc(national_number_pattern='180\\d{5,11}|13(?:7[1-6]\\d\\d|8)\\d{4}', example_number='18012345', possible_length=(7, 8, 9, 10, 11, 12, 13, 14)), @@ -26,8 +26,8 @@ NumberFormat(pattern='(\\d{5})(\\d{6})', format='\\1 \\2', leading_digits_pattern=['185', '1850', '18500'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{3})(\\d{4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['7'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{4})(\\d{7})', format='\\1 \\2', leading_digits_pattern=['18[68]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{5})(\\d{6})', format='\\1 \\2', leading_digits_pattern=['15[0568]'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{4})(\\d{7})', format='\\1 \\2', leading_digits_pattern=['15[1279]'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{5})(\\d{6})', format='\\1 \\2', leading_digits_pattern=['15[03568]', '15(?:[0568]|31)'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{3})(\\d{8})', format='\\1 \\2', leading_digits_pattern=['18'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{7,8})', format='\\1 \\2 \\3', leading_digits_pattern=['1(?:6[023]|7)'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{4})(\\d{2})(\\d{7})', format='\\1 \\2 \\3', leading_digits_pattern=['15[279]'], national_prefix_formatting_rule='0\\1'), diff --git a/python/phonenumbers/data/region_EE.py b/python/phonenumbers/data/region_EE.py index 5375207a..b5062130 100644 --- a/python/phonenumbers/data/region_EE.py +++ b/python/phonenumbers/data/region_EE.py @@ -4,7 +4,7 @@ PHONE_METADATA_EE = PhoneMetadata(id='EE', country_code=372, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='8\\d{9}|[4578]\\d{7}|(?:[3-8]\\d|90)\\d{5}', possible_length=(7, 8, 10)), fixed_line=PhoneNumberDesc(national_number_pattern='(?:3[23589]|4[3-8]|6\\d|7[1-9]|88)\\d{5}', example_number='3212345', possible_length=(7,)), - mobile=PhoneNumberDesc(national_number_pattern='(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[236]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:000|(?:19|[2-7]\\d)\\d)|(?:(?:[124-6]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}', example_number='51234567', possible_length=(7, 8)), + mobile=PhoneNumberDesc(national_number_pattern='(?:5\\d{5}|8(?:1(?:0(?:0(?:00|[178]\\d)|[3-9]\\d\\d)|(?:1(?:0[236]|1\\d)|(?:2[0-59]|[3-79]\\d)\\d)\\d)|2(?:0(?:0(?:00|4\\d)|(?:19|[2-7]\\d)\\d)|(?:(?:[124-6]\\d|3[5-9])\\d|7(?:[0-79]\\d|8[13-9])|8(?:[2-6]\\d|7[01]))\\d)|[349]\\d{4}))\\d\\d|5(?:(?:[02]\\d|5[0-478])\\d|1(?:[0-8]\\d|95)|6(?:4[0-4]|5[1-589]))\\d{3}', example_number='51234567', possible_length=(7, 8)), toll_free=PhoneNumberDesc(national_number_pattern='800(?:(?:0\\d\\d|1)\\d|[2-9])\\d{3}', example_number='80012345', possible_length=(7, 8, 10)), premium_rate=PhoneNumberDesc(national_number_pattern='(?:40\\d\\d|900)\\d{4}', example_number='9001234', possible_length=(7, 8)), personal_number=PhoneNumberDesc(national_number_pattern='70[0-2]\\d{5}', example_number='70012345', possible_length=(8,)), diff --git a/python/phonenumbers/data/region_FI.py b/python/phonenumbers/data/region_FI.py index 224666f2..d3a15cc5 100644 --- a/python/phonenumbers/data/region_FI.py +++ b/python/phonenumbers/data/region_FI.py @@ -3,7 +3,7 @@ PHONE_METADATA_FI = PhoneMetadata(id='FI', country_code=358, international_prefix='00|99(?:[01469]|5(?:[14]1|3[23]|5[59]|77|88|9[09]))', general_desc=PhoneNumberDesc(national_number_pattern='[1-35689]\\d{4}|7\\d{10,11}|(?:[124-7]\\d|3[0-46-9])\\d{8}|[1-9]\\d{5,8}', possible_length=(5, 6, 7, 8, 9, 10, 11, 12)), - fixed_line=PhoneNumberDesc(national_number_pattern='(?:1[3-79][1-8]|[235689][1-8]\\d)\\d{2,6}', example_number='131234567', possible_length=(5, 6, 7, 8, 9)), + fixed_line=PhoneNumberDesc(national_number_pattern='(?:1[3-79][1-8]|[23568][1-8]\\d|9(?:00|[1-8]\\d))\\d{2,6}', example_number='131234567', possible_length=(5, 6, 7, 8, 9)), mobile=PhoneNumberDesc(national_number_pattern='4946\\d{2,6}|(?:4[0-8]|50)\\d{4,8}', example_number='412345678', possible_length=(6, 7, 8, 9, 10)), toll_free=PhoneNumberDesc(national_number_pattern='800\\d{4,6}', example_number='800123456', possible_length=(7, 8, 9)), premium_rate=PhoneNumberDesc(national_number_pattern='[67]00\\d{5,6}', example_number='600123456', possible_length=(8, 9)), @@ -13,15 +13,17 @@ national_prefix='0', national_prefix_for_parsing='0', number_format=[NumberFormat(pattern='(\\d{5})', format='\\1', leading_digits_pattern=['75[12]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d)(\\d{4,9})', format='\\1 \\2', leading_digits_pattern=['[2568][1-8]|3(?:0[1-9]|[1-9])|9'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{5})', format='\\1', leading_digits_pattern=['20[2-59]'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{6})', format='\\1', leading_digits_pattern=['11']), - NumberFormat(pattern='(\\d{3})(\\d{3,7})', format='\\1 \\2', leading_digits_pattern=['[12]00|[368]|70[07-9]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{2})(\\d{4,8})', format='\\1 \\2', leading_digits_pattern=['[1245]|7[135]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{2})(\\d{6,10})', format='\\1 \\2', leading_digits_pattern=['7'], national_prefix_formatting_rule='0\\1')], - intl_number_format=[NumberFormat(pattern='(\\d)(\\d{4,9})', format='\\1 \\2', leading_digits_pattern=['[2568][1-8]|3(?:0[1-9]|[1-9])|9']), - NumberFormat(pattern='(\\d{3})(\\d{3,7})', format='\\1 \\2', leading_digits_pattern=['[12]00|[368]|70[07-9]']), - NumberFormat(pattern='(\\d{2})(\\d{4,8})', format='\\1 \\2', leading_digits_pattern=['[1245]|7[135]']), - NumberFormat(pattern='(\\d{2})(\\d{6,10})', format='\\1 \\2', leading_digits_pattern=['7'])], + NumberFormat(pattern='(\\d{3})(\\d{3,7})', format='\\1 \\2', leading_digits_pattern=['(?:[1-3]0|[68])0|70[07-9]'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{2})(\\d{4,8})', format='\\1 \\2', leading_digits_pattern=['[14]|2[09]|50|7[135]'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{2})(\\d{6,10})', format='\\1 \\2', leading_digits_pattern=['7'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d)(\\d{4,9})', format='\\1 \\2', leading_digits_pattern=['(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9'], national_prefix_formatting_rule='0\\1')], + intl_number_format=[NumberFormat(pattern='(\\d{5})', format='\\1', leading_digits_pattern=['20[2-59]']), + NumberFormat(pattern='(\\d{3})(\\d{3,7})', format='\\1 \\2', leading_digits_pattern=['(?:[1-3]0|[68])0|70[07-9]']), + NumberFormat(pattern='(\\d{2})(\\d{4,8})', format='\\1 \\2', leading_digits_pattern=['[14]|2[09]|50|7[135]']), + NumberFormat(pattern='(\\d{2})(\\d{6,10})', format='\\1 \\2', leading_digits_pattern=['7']), + NumberFormat(pattern='(\\d)(\\d{4,9})', format='\\1 \\2', leading_digits_pattern=['(?:1[3-79]|[2568])[1-8]|3(?:0[1-9]|[1-9])|9'])], main_country_for_code=True, leading_digits='1[03-79]|[2-9]', mobile_number_portable_region=True) diff --git a/python/phonenumbers/data/region_GE.py b/python/phonenumbers/data/region_GE.py index 42c5b8a8..9f44a556 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(?:00(?:0\\d|11|22|33|44|5[05]|77|88|99)|1(?:1(?:00|[124]\\d|3[01])|4\\d\\d)|(?:44|68)\\d\\d|5(?:[0157-9]\\d\\d|200)|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|58[89]|8(?:55|88))|9(?:090|[1-35-9]\\d\\d))|790\\d\\d)\\d{4}|5(?:0(?:070|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(?:00(?:0\\d|11|22|33|44|5[05]|77|88|9[09])|1(?:1(?:00|[124]\\d|3[01])|4\\d\\d)|(?:44|68)\\d\\d|5(?:[0157-9]\\d\\d|200)|7(?:[0147-9]\\d\\d|5(?:00|[57]5))|8(?:0(?:[018]\\d|2[0-4])|58[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,)), 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 159c9f07..496eee0c 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]|[59]\\d|6[01]))|58(?:0[1-9]|1[2-9]))\\d{4}', example_number='21234567', possible_length=(8,)), - mobile=PhoneNumberDesc(national_number_pattern='(?:4(?:44[5-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-6]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]|899))\\d{4}|(?:4(?:4[015]|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])|84[09]|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[5-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-6]|8[0-4])|848[0-25-9]|9(?:29[013-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0156]|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])|709|84[09]|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_PY.py b/python/phonenumbers/data/region_PY.py index d982cbb2..9f9fd3fe 100644 --- a/python/phonenumbers/data/region_PY.py +++ b/python/phonenumbers/data/region_PY.py @@ -4,7 +4,7 @@ PHONE_METADATA_PY = PhoneMetadata(id='PY', country_code=595, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='59\\d{4,6}|9\\d{5,10}|(?:[2-46-8]\\d|5[0-8])\\d{4,7}', possible_length=(6, 7, 8, 9, 10, 11), possible_length_local_only=(5,)), fixed_line=PhoneNumberDesc(national_number_pattern='(?:[26]1|3[289]|4[1246-8]|7[1-3]|8[1-36])\\d{5,7}|(?:2(?:2[4-68]|[4-68]\\d|7[15]|9[1-5])|3(?:18|3[167]|4[2357]|51|[67]\\d)|4(?:3[12]|5[13]|9[1-47])|5(?:[1-4]\\d|5[02-4])|6(?:3[1-3]|44|7[1-8])|7(?:4[0-4]|5\\d|6[1-578]|75|8[0-8])|858)\\d{5,6}', example_number='212345678', possible_length=(7, 8, 9), possible_length_local_only=(5, 6)), - mobile=PhoneNumberDesc(national_number_pattern='9(?:51|6[129]|[78][1-6]|9[1-5])\\d{6}', example_number='961456789', possible_length=(9,)), + mobile=PhoneNumberDesc(national_number_pattern='9(?:51|6[129]|7[1-6]|8[1-7]|9[1-5])\\d{6}', example_number='961456789', possible_length=(9,)), toll_free=PhoneNumberDesc(national_number_pattern='9800\\d{5,7}', example_number='98000123456', possible_length=(9, 10, 11)), voip=PhoneNumberDesc(national_number_pattern='8700[0-4]\\d{4}', example_number='870012345', possible_length=(9,)), uan=PhoneNumberDesc(national_number_pattern='[2-9]0\\d{4,7}', example_number='201234567', possible_length=(6, 7, 8, 9)), @@ -15,7 +15,7 @@ NumberFormat(pattern='(\\d{3})(\\d{4,5})', format='\\1 \\2', leading_digits_pattern=['2[279]|3[13-5]|4[359]|5|6(?:[34]|7[1-46-8])|7[46-8]|85'], national_prefix_formatting_rule='(0\\1)'), NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['2[14-68]|3[26-9]|4[1246-8]|6(?:1|75)|7[1-35]|8[1-36]'], national_prefix_formatting_rule='(0\\1)'), NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['87']), - NumberFormat(pattern='(\\d{3})(\\d{6})', format='\\1 \\2', leading_digits_pattern=['9(?:[5-79]|8[1-6])'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{3})(\\d{6})', format='\\1 \\2', leading_digits_pattern=['9(?:[5-79]|8[1-7])'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-8]'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{4})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['9'])], mobile_number_portable_region=True) diff --git a/python/phonenumbers/data/region_RO.py b/python/phonenumbers/data/region_RO.py index fadbe44c..ed65d612 100644 --- a/python/phonenumbers/data/region_RO.py +++ b/python/phonenumbers/data/region_RO.py @@ -2,9 +2,9 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata PHONE_METADATA_RO = PhoneMetadata(id='RO', country_code=40, international_prefix='00', - general_desc=PhoneNumberDesc(national_number_pattern='(?:[2378]\\d|62|90)\\d{7}|[23]\\d{5}', possible_length=(6, 9)), + general_desc=PhoneNumberDesc(national_number_pattern='(?:[236-8]\\d|90)\\d{7}|[23]\\d{5}', possible_length=(6, 9)), fixed_line=PhoneNumberDesc(national_number_pattern='[23][13-6]\\d{7}|(?:2(?:19\\d|[3-6]\\d9)|31\\d\\d)\\d\\d', example_number='211234567', possible_length=(6, 9)), - mobile=PhoneNumberDesc(national_number_pattern='7020\\d{5}|(?:62\\d|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', example_number='712034567', possible_length=(9,)), + mobile=PhoneNumberDesc(national_number_pattern='7020\\d{5}|(?:6(?:2\\d|40)|7(?:0[013-9]|1[0-3]|[2-7]\\d|8[03-8]|9[0-39]))\\d{6}', example_number='712034567', possible_length=(9,)), toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6}', example_number='800123456', possible_length=(9,)), premium_rate=PhoneNumberDesc(national_number_pattern='90[0136]\\d{6}', example_number='900123456', possible_length=(9,)), shared_cost=PhoneNumberDesc(national_number_pattern='801\\d{6}', example_number='801123456', possible_length=(9,)), diff --git a/python/phonenumbers/data/region_SG.py b/python/phonenumbers/data/region_SG.py index 53d2400c..df47889d 100644 --- a/python/phonenumbers/data/region_SG.py +++ b/python/phonenumbers/data/region_SG.py @@ -4,7 +4,7 @@ PHONE_METADATA_SG = PhoneMetadata(id='SG', country_code=65, international_prefix='0[0-3]\\d', general_desc=PhoneNumberDesc(national_number_pattern='(?:(?:1\\d|8)\\d\\d|7000)\\d{7}|[3689]\\d{7}', possible_length=(8, 10, 11)), fixed_line=PhoneNumberDesc(national_number_pattern='662[0-24-9]\\d{4}|6(?:[0-578]\\d|6[013-57-9]|9[0-35-9])\\d{5}', example_number='61234567', possible_length=(8,)), - mobile=PhoneNumberDesc(national_number_pattern='8(?:08[013]|95[0-2])\\d{4}|(?:8(?:0[1-7]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', example_number='81234567', possible_length=(8,)), + mobile=PhoneNumberDesc(national_number_pattern='8(?:08[013-9]|95[0-2])\\d{4}|(?:8(?:0[1-7]|[1-8]\\d|9[0-4])|9[0-8]\\d)\\d{5}', example_number='81234567', possible_length=(8,)), toll_free=PhoneNumberDesc(national_number_pattern='(?:18|8)00\\d{7}', example_number='18001234567', possible_length=(10, 11)), premium_rate=PhoneNumberDesc(national_number_pattern='1900\\d{7}', example_number='19001234567', possible_length=(11,)), voip=PhoneNumberDesc(national_number_pattern='(?:3[12]\\d|666)\\d{5}', example_number='31234567', possible_length=(8,)), diff --git a/python/phonenumbers/data/region_US.py b/python/phonenumbers/data/region_US.py index 2132e412..46fb3361 100644 --- a/python/phonenumbers/data/region_US.py +++ b/python/phonenumbers/data/region_US.py @@ -3,8 +3,8 @@ PHONE_METADATA_US = PhoneMetadata(id='US', country_code=1, international_prefix='011', general_desc=PhoneNumberDesc(national_number_pattern='[2-9]\\d{9}|3\\d{6}', possible_length=(10,), possible_length_local_only=(7,)), - fixed_line=PhoneNumberDesc(national_number_pattern='(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:4722|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', example_number='2015550123', possible_length=(10,), possible_length_local_only=(7,)), - mobile=PhoneNumberDesc(national_number_pattern='(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:4722|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', example_number='2015550123', possible_length=(10,), possible_length_local_only=(7,)), + fixed_line=PhoneNumberDesc(national_number_pattern='(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:472[24]|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', example_number='2015550123', possible_length=(10,), possible_length_local_only=(7,)), + mobile=PhoneNumberDesc(national_number_pattern='(?:5056(?:[0-35-9]\\d|4[468])|73020\\d)\\d{4}|(?:472[24]|505[2-57-9]|983[289])\\d{6}|(?:2(?:0[1-35-9]|1[02-9]|2[03-57-9]|3[149]|4[08]|5[1-46]|6[0279]|7[0269]|8[13])|3(?:0[1-57-9]|1[02-9]|2[013569]|3[0-24679]|4[167]|5[0-2]|6[0149]|8[056])|4(?:0[124-9]|1[02-579]|2[3-5]|3[0245]|4[023578]|58|6[349]|7[0589]|8[04])|5(?:0[1-47-9]|1[0235-8]|20|3[0149]|4[01]|5[179]|6[1-47]|7[0-5]|8[0256])|6(?:0[1-35-9]|1[024-9]|2[03689]|[34][016]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-7]|3[1247]|4[037]|5[47]|6[02359]|7[0-59]|8[156])|8(?:0[1-68]|1[02-8]|2[068]|3[0-2589]|4[03578]|5[046-9]|6[02-5]|7[028])|9(?:0[1346-9]|1[02-9]|2[0589]|3[0146-8]|4[01357-9]|5[12469]|7[0-389]|8[04-69]))[2-9]\\d{6}', example_number='2015550123', possible_length=(10,), possible_length_local_only=(7,)), toll_free=PhoneNumberDesc(national_number_pattern='8(?:00|33|44|55|66|77|88)[2-9]\\d{6}', example_number='8002345678', possible_length=(10,)), premium_rate=PhoneNumberDesc(national_number_pattern='900[2-9]\\d{6}', example_number='9002345678', possible_length=(10,)), personal_number=PhoneNumberDesc(national_number_pattern='52(?:3(?:[2-46-9][02-9]\\d|5(?:[02-46-9]\\d|5[0-46-9]))|4(?:[2-478][02-9]\\d|5(?:[034]\\d|2[024-9]|5[0-46-9])|6(?:0[1-9]|[2-9]\\d)|9(?:[05-9]\\d|2[0-5]|49)))\\d{4}|52[34][2-9]1[02-9]\\d{4}|5(?:00|2[125-9]|33|44|66|77|88)[2-9]\\d{6}', example_number='5002345678', possible_length=(10,)), diff --git a/python/phonenumbers/geodata/data10.py b/python/phonenumbers/geodata/data10.py index 8d2a1a9f..b85b19a6 100644 --- a/python/phonenumbers/geodata/data10.py +++ b/python/phonenumbers/geodata/data10.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '61348015':{'en': 'Cornalla'}, - '61348016':{'en': 'Deniliquin'}, - '61348017':{'en': 'Dookie'}, - '61348018':{'en': 'Finley'}, - '61348019':{'en': 'Jerilderie'}, '61348020':{'en': 'Jimaringle'}, '61348021':{'en': 'Katamatite'}, '61348022':{'en': 'Katandra West'}, @@ -10019,4 +10014,9 @@ '6138787':{'en': 'Dandenong'}, '6138788':{'en': 'Dandenong'}, '6138789':{'en': 'Dandenong'}, + '613879':{'en': 'Dandenong'}, + '6138798':{'en': 'Sunbury'}, + '6138799':{'en': 'Croydon'}, + '6138800':{'en': 'Melbourne'}, + '6138801':{'en': 'Ringwood'}, } diff --git a/python/phonenumbers/geodata/data11.py b/python/phonenumbers/geodata/data11.py index 4435c3e1..241fcbc3 100644 --- a/python/phonenumbers/geodata/data11.py +++ b/python/phonenumbers/geodata/data11.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '613879':{'en': 'Dandenong'}, - '6138798':{'en': 'Sunbury'}, - '6138799':{'en': 'Croydon'}, - '6138800':{'en': 'Melbourne'}, - '6138801':{'en': 'Ringwood'}, '6138802':{'en': 'Melbourne'}, '61388030':{'en': 'Melbourne'}, '61388031':{'en': 'Melbourne'}, @@ -10019,4 +10014,9 @@ '61749586':{'en': 'Gargett'}, '61749587':{'en': 'Wagoora'}, '61749588':{'en': 'Calen'}, + '61749589':{'en': 'Glenden'}, + '61749590':{'en': 'Yakapari'}, + '61749591':{'en': 'Walkerston'}, + '61749592':{'en': 'Walkerston'}, + '61749593':{'en': 'Walkerston'}, } diff --git a/python/phonenumbers/geodata/data12.py b/python/phonenumbers/geodata/data12.py index 569e50a6..6ef8ab7e 100644 --- a/python/phonenumbers/geodata/data12.py +++ b/python/phonenumbers/geodata/data12.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '61749589':{'en': 'Glenden'}, - '61749590':{'en': 'Yakapari'}, - '61749591':{'en': 'Walkerston'}, - '61749592':{'en': 'Walkerston'}, - '61749593':{'en': 'Walkerston'}, '61749594':{'en': 'Walkerston'}, '61749595':{'en': 'Mackay'}, '61749596':{'en': 'Mackay'}, @@ -10019,4 +10014,9 @@ '618854558':{'en': 'New Well'}, '618854560':{'en': 'Taylorville'}, '618854561':{'en': 'Taylorville'}, + '618854562':{'en': 'Taylorville'}, + '618854563':{'en': 'Taylorville'}, + '618854564':{'en': 'Taylorville'}, + '618854565':{'en': 'Taylorville'}, + '618854566':{'en': 'Taylorville'}, } diff --git a/python/phonenumbers/geodata/data13.py b/python/phonenumbers/geodata/data13.py index b1da83b5..88abec1d 100644 --- a/python/phonenumbers/geodata/data13.py +++ b/python/phonenumbers/geodata/data13.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '618854562':{'en': 'Taylorville'}, - '618854563':{'en': 'Taylorville'}, - '618854564':{'en': 'Taylorville'}, - '618854565':{'en': 'Taylorville'}, - '618854566':{'en': 'Taylorville'}, '618854567':{'en': 'Taylorville'}, '618854568':{'en': 'Taylorville'}, '618854570':{'en': 'Waikerie'}, @@ -10019,4 +10014,9 @@ '618989121':{'en': 'Cuballing'}, '618989122':{'en': 'Cuballing'}, '618989123':{'en': 'Cuballing'}, + '618989124':{'en': 'Cuballing'}, + '618989125':{'en': 'Cuballing'}, + '618989126':{'en': 'Cuballing'}, + '618989127':{'en': 'Cuballing'}, + '618989128':{'en': 'Cuballing'}, } diff --git a/python/phonenumbers/geodata/data14.py b/python/phonenumbers/geodata/data14.py index ca4dd0d0..c246c785 100644 --- a/python/phonenumbers/geodata/data14.py +++ b/python/phonenumbers/geodata/data14.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '618989124':{'en': 'Cuballing'}, - '618989125':{'en': 'Cuballing'}, - '618989126':{'en': 'Cuballing'}, - '618989127':{'en': 'Cuballing'}, - '618989128':{'en': 'Cuballing'}, '618989130':{'en': 'Narrakine'}, '618989133':{'en': 'Narrakine'}, '618989136':{'en': 'Narrakine'}, @@ -10019,4 +10014,9 @@ '86130665':{'en': 'Shenyang, Liaoning', 'zh': u('\u8fbd\u5b81\u7701\u6c88\u9633\u5e02')}, '86130666':{'en': 'Shenyang, Liaoning', 'zh': u('\u8fbd\u5b81\u7701\u6c88\u9633\u5e02')}, '86130667':{'en': 'Shenyang, Liaoning', 'zh': u('\u8fbd\u5b81\u7701\u6c88\u9633\u5e02')}, + '86130668':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, + '86130669':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, + '86130670':{'en': 'Quanzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6cc9\u5dde\u5e02')}, + '861306700':{'en': 'Sanming, Fujian', 'zh': u('\u798f\u5efa\u7701\u4e09\u660e\u5e02')}, + '861306701':{'en': 'Sanming, Fujian', 'zh': u('\u798f\u5efa\u7701\u4e09\u660e\u5e02')}, } diff --git a/python/phonenumbers/geodata/data15.py b/python/phonenumbers/geodata/data15.py index c162ce59..1d6dbd88 100644 --- a/python/phonenumbers/geodata/data15.py +++ b/python/phonenumbers/geodata/data15.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '86130668':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, - '86130669':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, - '86130670':{'en': 'Quanzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6cc9\u5dde\u5e02')}, - '861306700':{'en': 'Sanming, Fujian', 'zh': u('\u798f\u5efa\u7701\u4e09\u660e\u5e02')}, - '861306701':{'en': 'Sanming, Fujian', 'zh': u('\u798f\u5efa\u7701\u4e09\u660e\u5e02')}, '86130671':{'en': 'Quanzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u6cc9\u5dde\u5e02')}, '861306710':{'en': 'Fuzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u798f\u5dde\u5e02')}, '861306711':{'en': 'Fuzhou, Fujian', 'zh': u('\u798f\u5efa\u7701\u798f\u5dde\u5e02')}, @@ -10019,4 +10014,9 @@ '861323775':{'en': 'Guigang, Guangxi', 'zh': u('\u5e7f\u897f\u8d35\u6e2f\u5e02')}, '861323776':{'en': 'Baise, Guangxi', 'zh': u('\u5e7f\u897f\u767e\u8272\u5e02')}, '861323777':{'en': 'Hezhou, Guangxi', 'zh': u('\u5e7f\u897f\u8d3a\u5dde\u5e02')}, + '861323778':{'en': 'Hechi, Guangxi', 'zh': u('\u5e7f\u897f\u6cb3\u6c60\u5e02')}, + '861323779':{'en': 'Laibin, Guangxi', 'zh': u('\u5e7f\u897f\u6765\u5bbe\u5e02')}, + '861323780':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, + '861323781':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, + '861323782':{'en': 'Liuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u67f3\u5dde\u5e02')}, } diff --git a/python/phonenumbers/geodata/data16.py b/python/phonenumbers/geodata/data16.py index 2d292895..f0d81e3b 100644 --- a/python/phonenumbers/geodata/data16.py +++ b/python/phonenumbers/geodata/data16.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '861323778':{'en': 'Hechi, Guangxi', 'zh': u('\u5e7f\u897f\u6cb3\u6c60\u5e02')}, - '861323779':{'en': 'Laibin, Guangxi', 'zh': u('\u5e7f\u897f\u6765\u5bbe\u5e02')}, - '861323780':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, - '861323781':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, - '861323782':{'en': 'Liuzhou, Guangxi', 'zh': u('\u5e7f\u897f\u67f3\u5dde\u5e02')}, '861323783':{'en': 'Guilin, Guangxi', 'zh': u('\u5e7f\u897f\u6842\u6797\u5e02')}, '861323784':{'en': 'Hezhou, Guangxi', 'zh': u('\u5e7f\u897f\u8d3a\u5dde\u5e02')}, '861323785':{'en': 'Guigang, Guangxi', 'zh': u('\u5e7f\u897f\u8d35\u6e2f\u5e02')}, @@ -10019,4 +10014,9 @@ '861340030':{'en': 'Handan, Hebei', 'zh': u('\u6cb3\u5317\u7701\u90af\u90f8\u5e02')}, '861340031':{'en': 'Shijiazhuang, Hebei', 'zh': u('\u6cb3\u5317\u7701\u77f3\u5bb6\u5e84\u5e02')}, '861340040':{'en': 'Handan, Hebei', 'zh': u('\u6cb3\u5317\u7701\u90af\u90f8\u5e02')}, + '861340041':{'en': 'Shijiazhuang, Hebei', 'zh': u('\u6cb3\u5317\u7701\u77f3\u5bb6\u5e84\u5e02')}, + '861340042':{'en': 'Baoding, Hebei', 'zh': u('\u6cb3\u5317\u7701\u4fdd\u5b9a\u5e02')}, + '861340043':{'en': 'Baoding, Hebei', 'zh': u('\u6cb3\u5317\u7701\u4fdd\u5b9a\u5e02')}, + '861340044':{'en': 'Baoding, Hebei', 'zh': u('\u6cb3\u5317\u7701\u4fdd\u5b9a\u5e02')}, + '861340045':{'en': 'Tangshan, Hebei', 'zh': u('\u6cb3\u5317\u7701\u5510\u5c71\u5e02')}, } diff --git a/python/phonenumbers/geodata/data17.py b/python/phonenumbers/geodata/data17.py index 1892ac5e..ff811929 100644 --- a/python/phonenumbers/geodata/data17.py +++ b/python/phonenumbers/geodata/data17.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '861340041':{'en': 'Shijiazhuang, Hebei', 'zh': u('\u6cb3\u5317\u7701\u77f3\u5bb6\u5e84\u5e02')}, - '861340042':{'en': 'Baoding, Hebei', 'zh': u('\u6cb3\u5317\u7701\u4fdd\u5b9a\u5e02')}, - '861340043':{'en': 'Baoding, Hebei', 'zh': u('\u6cb3\u5317\u7701\u4fdd\u5b9a\u5e02')}, - '861340044':{'en': 'Baoding, Hebei', 'zh': u('\u6cb3\u5317\u7701\u4fdd\u5b9a\u5e02')}, - '861340045':{'en': 'Tangshan, Hebei', 'zh': u('\u6cb3\u5317\u7701\u5510\u5c71\u5e02')}, '861340046':{'en': 'Zhangjiakou, Hebei', 'zh': u('\u6cb3\u5317\u7701\u5f20\u5bb6\u53e3\u5e02')}, '861340047':{'en': 'Cangzhou, Hebei', 'zh': u('\u6cb3\u5317\u7701\u6ca7\u5dde\u5e02')}, '861340048':{'en': 'Hengshui, Hebei', 'zh': u('\u6cb3\u5317\u7701\u8861\u6c34\u5e02')}, @@ -10019,4 +10014,9 @@ '861365068':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')}, '861365069':{'en': 'Heyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6cb3\u6e90\u5e02')}, '86136507':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, + '86136508':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, + '86136509':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, + '86136510':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, + '86136511':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, + '86136512':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, } diff --git a/python/phonenumbers/geodata/data18.py b/python/phonenumbers/geodata/data18.py index a3ff6bd8..a67d4ec8 100644 --- a/python/phonenumbers/geodata/data18.py +++ b/python/phonenumbers/geodata/data18.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '86136508':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, - '86136509':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, - '86136510':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, - '86136511':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, - '86136512':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, '86136513':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, '86136514':{'en': 'Shenzhen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6df1\u5733\u5e02')}, '861365150':{'en': 'Changzhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u5e38\u5dde\u5e02')}, @@ -10019,4 +10014,9 @@ '861394733':{'en': 'Wuhai, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u4e4c\u6d77\u5e02')}, '861394734':{'en': 'Wuhai, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u4e4c\u6d77\u5e02')}, '861394735':{'en': 'Tongliao, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u901a\u8fbd\u5e02')}, + '861394736':{'en': 'Chifeng, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u8d64\u5cf0\u5e02')}, + '861394737':{'en': 'Ordos, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u9102\u5c14\u591a\u65af\u5e02')}, + '861394738':{'en': 'Bayannur, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5df4\u5f66\u6dd6\u5c14\u5e02')}, + '861394739':{'en': 'Xilin, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u9521\u6797\u90ed\u52d2\u76df')}, + '86139474':{'en': 'Ulanqab, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u4e4c\u5170\u5bdf\u5e03\u5e02')}, } diff --git a/python/phonenumbers/geodata/data19.py b/python/phonenumbers/geodata/data19.py index cd3d5ebd..428961b9 100644 --- a/python/phonenumbers/geodata/data19.py +++ b/python/phonenumbers/geodata/data19.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '861394736':{'en': 'Chifeng, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u8d64\u5cf0\u5e02')}, - '861394737':{'en': 'Ordos, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u9102\u5c14\u591a\u65af\u5e02')}, - '861394738':{'en': 'Bayannur, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5df4\u5f66\u6dd6\u5c14\u5e02')}, - '861394739':{'en': 'Xilin, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u9521\u6797\u90ed\u52d2\u76df')}, - '86139474':{'en': 'Ulanqab, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u4e4c\u5170\u5bdf\u5e03\u5e02')}, '861394748':{'en': 'Hinggan, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5174\u5b89\u76df')}, '861394749':{'en': 'Alxa, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u963f\u62c9\u5584\u76df')}, '86139475':{'en': 'Tongliao, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u901a\u8fbd\u5e02')}, @@ -10019,4 +10014,9 @@ '861506111':{'en': 'Changzhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u5e38\u5dde\u5e02')}, '861506112':{'en': 'Changzhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u5e38\u5dde\u5e02')}, '861506113':{'en': 'Changzhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u5e38\u5dde\u5e02')}, + '861506114':{'en': 'Changzhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u5e38\u5dde\u5e02')}, + '861506115':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, + '861506116':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, + '861506117':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, + '861506118':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, } diff --git a/python/phonenumbers/geodata/data20.py b/python/phonenumbers/geodata/data20.py index e2dcaa28..9744177b 100644 --- a/python/phonenumbers/geodata/data20.py +++ b/python/phonenumbers/geodata/data20.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '861506114':{'en': 'Changzhou, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u5e38\u5dde\u5e02')}, - '861506115':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, - '861506116':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, - '861506117':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, - '861506118':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, '861506119':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, '86150612':{'en': 'HuaiAn, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u6dee\u5b89\u5e02')}, '86150613':{'en': 'Lianyungang, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u8fde\u4e91\u6e2f\u5e02')}, @@ -10019,4 +10014,9 @@ '861533593':{'en': 'Xiangfan, Hubei', 'zh': u('\u6e56\u5317\u7701\u8944\u6a0a\u5e02')}, '861533594':{'en': 'Xianning, Hubei', 'zh': u('\u6e56\u5317\u7701\u54b8\u5b81\u5e02')}, '861533595':{'en': 'Xianning, Hubei', 'zh': u('\u6e56\u5317\u7701\u54b8\u5b81\u5e02')}, + '861533596':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')}, + '861533597':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')}, + '861533598':{'en': 'Huanggang, Hubei', 'zh': u('\u6e56\u5317\u7701\u9ec4\u5188\u5e02')}, + '861533599':{'en': 'Huanggang, Hubei', 'zh': u('\u6e56\u5317\u7701\u9ec4\u5188\u5e02')}, + '861533600':{'en': 'Linxia, Gansu', 'zh': u('\u7518\u8083\u7701\u4e34\u590f\u56de\u65cf\u81ea\u6cbb\u5dde')}, } diff --git a/python/phonenumbers/geodata/data21.py b/python/phonenumbers/geodata/data21.py index aa17db75..5c65fe35 100644 --- a/python/phonenumbers/geodata/data21.py +++ b/python/phonenumbers/geodata/data21.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '861533596':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')}, - '861533597':{'en': 'Shiyan, Hubei', 'zh': u('\u6e56\u5317\u7701\u5341\u5830\u5e02')}, - '861533598':{'en': 'Huanggang, Hubei', 'zh': u('\u6e56\u5317\u7701\u9ec4\u5188\u5e02')}, - '861533599':{'en': 'Huanggang, Hubei', 'zh': u('\u6e56\u5317\u7701\u9ec4\u5188\u5e02')}, - '861533600':{'en': 'Linxia, Gansu', 'zh': u('\u7518\u8083\u7701\u4e34\u590f\u56de\u65cf\u81ea\u6cbb\u5dde')}, '861533601':{'en': 'Tianshui, Gansu', 'zh': u('\u7518\u8083\u7701\u5929\u6c34\u5e02')}, '861533602':{'en': 'Qingyang, Gansu', 'zh': u('\u7518\u8083\u7701\u5e86\u9633\u5e02')}, '861533603':{'en': 'Pingliang, Gansu', 'zh': u('\u7518\u8083\u7701\u5e73\u51c9\u5e02')}, @@ -10019,4 +10014,9 @@ '86156703':{'en': 'Luoyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u6d1b\u9633\u5e02')}, '86156704':{'en': 'Xinxiang, Henan', 'zh': u('\u6cb3\u5357\u7701\u65b0\u4e61\u5e02')}, '86156705':{'en': 'Xinxiang, Henan', 'zh': u('\u6cb3\u5357\u7701\u65b0\u4e61\u5e02')}, + '861567060':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, + '861567061':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, + '861567062':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, + '861567063':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, + '861567064':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')}, } diff --git a/python/phonenumbers/geodata/data22.py b/python/phonenumbers/geodata/data22.py index d4ef513e..6d4007d5 100644 --- a/python/phonenumbers/geodata/data22.py +++ b/python/phonenumbers/geodata/data22.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '861567060':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, - '861567061':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, - '861567062':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, - '861567063':{'en': 'Zhengzhou, Henan', 'zh': u('\u6cb3\u5357\u7701\u90d1\u5dde\u5e02')}, - '861567064':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')}, '861567065':{'en': 'Xinyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u4fe1\u9633\u5e02')}, '861567066':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')}, '861567067':{'en': 'Nanyang, Henan', 'zh': u('\u6cb3\u5357\u7701\u5357\u9633\u5e02')}, @@ -10019,4 +10014,9 @@ '861594651':{'en': 'Qiqihar, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9f50\u9f50\u54c8\u5c14\u5e02')}, '861594652':{'en': 'Qiqihar, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9f50\u9f50\u54c8\u5c14\u5e02')}, '86159466':{'en': 'Hegang, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e64\u5c97\u5e02')}, + '861594666':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, + '861594667':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, + '861594668':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, + '861594669':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, + '86159467':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, } diff --git a/python/phonenumbers/geodata/data23.py b/python/phonenumbers/geodata/data23.py index ed44b12d..808f609d 100644 --- a/python/phonenumbers/geodata/data23.py +++ b/python/phonenumbers/geodata/data23.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '861594666':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, - '861594667':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, - '861594668':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, - '861594669':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, - '86159467':{'en': 'Jixi, Heilongjiang', 'zh': u('\u9ed1\u9f99\u6c5f\u7701\u9e21\u897f\u5e02')}, '86159468':{'en': 'Shangrao, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u4e0a\u9976\u5e02')}, '86159469':{'en': 'Fuzhou, Jiangxi', 'zh': u('\u6c5f\u897f\u7701\u629a\u5dde\u5e02')}, '861594700':{'en': 'Hulun, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u547c\u4f26\u8d1d\u5c14\u5e02')}, @@ -10019,4 +10014,9 @@ '861783508':{'en': 'Linfen, Shanxi', 'zh': u('\u5c71\u897f\u7701\u4e34\u6c7e\u5e02')}, '861783509':{'en': 'Linfen, Shanxi', 'zh': u('\u5c71\u897f\u7701\u4e34\u6c7e\u5e02')}, '86178351':{'en': 'Taiyuan, Shanxi', 'zh': u('\u5c71\u897f\u7701\u592a\u539f\u5e02')}, + '86178352':{'en': 'Datong, Shanxi', 'zh': u('\u5c71\u897f\u7701\u5927\u540c\u5e02')}, + '861783526':{'en': u('L\u00fcliang, Shanxi'), 'zh': u('\u5c71\u897f\u7701\u5415\u6881\u5e02')}, + '861783527':{'en': u('L\u00fcliang, Shanxi'), 'zh': u('\u5c71\u897f\u7701\u5415\u6881\u5e02')}, + '861783528':{'en': u('L\u00fcliang, Shanxi'), 'zh': u('\u5c71\u897f\u7701\u5415\u6881\u5e02')}, + '861783529':{'en': u('L\u00fcliang, Shanxi'), 'zh': u('\u5c71\u897f\u7701\u5415\u6881\u5e02')}, } diff --git a/python/phonenumbers/geodata/data24.py b/python/phonenumbers/geodata/data24.py index 3bc24ce5..1d288ad6 100644 --- a/python/phonenumbers/geodata/data24.py +++ b/python/phonenumbers/geodata/data24.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '86178352':{'en': 'Datong, Shanxi', 'zh': u('\u5c71\u897f\u7701\u5927\u540c\u5e02')}, - '861783526':{'en': u('L\u00fcliang, Shanxi'), 'zh': u('\u5c71\u897f\u7701\u5415\u6881\u5e02')}, - '861783527':{'en': u('L\u00fcliang, Shanxi'), 'zh': u('\u5c71\u897f\u7701\u5415\u6881\u5e02')}, - '861783528':{'en': u('L\u00fcliang, Shanxi'), 'zh': u('\u5c71\u897f\u7701\u5415\u6881\u5e02')}, - '861783529':{'en': u('L\u00fcliang, Shanxi'), 'zh': u('\u5c71\u897f\u7701\u5415\u6881\u5e02')}, '86178353':{'en': 'Yuncheng, Shanxi', 'zh': u('\u5c71\u897f\u7701\u8fd0\u57ce\u5e02')}, '861783530':{'en': 'Yangquan, Shanxi', 'zh': u('\u5c71\u897f\u7701\u9633\u6cc9\u5e02')}, '861783531':{'en': 'Yangquan, Shanxi', 'zh': u('\u5c71\u897f\u7701\u9633\u6cc9\u5e02')}, @@ -10019,4 +10014,9 @@ '861819930':{'en': 'Urumchi, Xinjiang', 'zh': u('\u65b0\u7586\u4e4c\u9c81\u6728\u9f50\u5e02')}, '861819931':{'en': 'Urumchi, Xinjiang', 'zh': u('\u65b0\u7586\u4e4c\u9c81\u6728\u9f50\u5e02')}, '861819932':{'en': 'Urumchi, Xinjiang', 'zh': u('\u65b0\u7586\u4e4c\u9c81\u6728\u9f50\u5e02')}, + '86181994':{'en': 'Aksu, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u514b\u82cf\u5730\u533a')}, + '86181995':{'en': 'Kashi, Xinjiang', 'zh': u('\u65b0\u7586\u5580\u4ec0\u5730\u533a')}, + '861819960':{'en': 'Altay, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u52d2\u6cf0\u5730\u533a')}, + '861819961':{'en': 'Altay, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u52d2\u6cf0\u5730\u533a')}, + '861819962':{'en': 'Altay, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u52d2\u6cf0\u5730\u533a')}, } diff --git a/python/phonenumbers/geodata/data25.py b/python/phonenumbers/geodata/data25.py index 2c4e4f6c..c787902e 100644 --- a/python/phonenumbers/geodata/data25.py +++ b/python/phonenumbers/geodata/data25.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '86181994':{'en': 'Aksu, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u514b\u82cf\u5730\u533a')}, - '86181995':{'en': 'Kashi, Xinjiang', 'zh': u('\u65b0\u7586\u5580\u4ec0\u5730\u533a')}, - '861819960':{'en': 'Altay, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u52d2\u6cf0\u5730\u533a')}, - '861819961':{'en': 'Altay, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u52d2\u6cf0\u5730\u533a')}, - '861819962':{'en': 'Altay, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u52d2\u6cf0\u5730\u533a')}, '861819963':{'en': 'Altay, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u52d2\u6cf0\u5730\u533a')}, '861819964':{'en': 'Altay, Xinjiang', 'zh': u('\u65b0\u7586\u963f\u52d2\u6cf0\u5730\u533a')}, '861819965':{'en': 'Shihezi, Xinjiang', 'zh': u('\u65b0\u7586\u77f3\u6cb3\u5b50\u5e02')}, @@ -10019,4 +10014,9 @@ '861854801':{'en': 'Bayannur, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5df4\u5f66\u6dd6\u5c14\u5e02')}, '861854802':{'en': 'Bayannur, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5df4\u5f66\u6dd6\u5c14\u5e02')}, '86185481':{'en': 'Hohhot, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u547c\u548c\u6d69\u7279\u5e02')}, + '86185482':{'en': 'Hinggan, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5174\u5b89\u76df')}, + '861854830':{'en': 'Alxa, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u963f\u62c9\u5584\u76df')}, + '861854831':{'en': 'Bayannur, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5df4\u5f66\u6dd6\u5c14\u5e02')}, + '861854832':{'en': 'Bayannur, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5df4\u5f66\u6dd6\u5c14\u5e02')}, + '86185487':{'en': 'Ordos, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u9102\u5c14\u591a\u65af\u5e02')}, } diff --git a/python/phonenumbers/geodata/data26.py b/python/phonenumbers/geodata/data26.py index f48a984c..093f28f6 100644 --- a/python/phonenumbers/geodata/data26.py +++ b/python/phonenumbers/geodata/data26.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '86185482':{'en': 'Hinggan, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5174\u5b89\u76df')}, - '861854830':{'en': 'Alxa, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u963f\u62c9\u5584\u76df')}, - '861854831':{'en': 'Bayannur, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5df4\u5f66\u6dd6\u5c14\u5e02')}, - '861854832':{'en': 'Bayannur, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u5df4\u5f66\u6dd6\u5c14\u5e02')}, - '86185487':{'en': 'Ordos, Inner Mongolia', 'zh': u('\u5185\u8499\u53e4\u9102\u5c14\u591a\u65af\u5e02')}, '86185488':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, '86185489':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, '8618549':{'en': 'Beijing', 'zh': u('\u5317\u4eac\u5e02')}, @@ -10019,4 +10014,9 @@ '861882061':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, '861882070':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')}, '861882071':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, + '861882072':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, + '861882073':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, + '861882074':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, + '861882075':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, + '861882076':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, } diff --git a/python/phonenumbers/geodata/data27.py b/python/phonenumbers/geodata/data27.py index 4cc799b2..cca7306a 100644 --- a/python/phonenumbers/geodata/data27.py +++ b/python/phonenumbers/geodata/data27.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '861882072':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, - '861882073':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, - '861882074':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, - '861882075':{'en': 'Dongguan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4e1c\u839e\u5e02')}, - '861882076':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, '861882077':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, '861882078':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, '861882079':{'en': 'Guangzhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u5e7f\u5dde\u5e02')}, @@ -10019,4 +10014,9 @@ '9168164':{'en': 'Mohana, Odisha'}, '9168165':{'en': 'Mohana, Odisha'}, '9168166':{'en': 'Mohana, Odisha'}, + '9168167':{'en': 'Mohana, Odisha'}, + '9168172':{'en': 'R.Udayigiri, Odisha'}, + '9168173':{'en': 'R.Udayigiri, Odisha'}, + '9168174':{'en': 'R.Udayigiri, Odisha'}, + '9168175':{'en': 'R.Udayigiri, Odisha'}, } diff --git a/python/phonenumbers/geodata/data28.py b/python/phonenumbers/geodata/data28.py index 517571f7..6c4cc9d1 100644 --- a/python/phonenumbers/geodata/data28.py +++ b/python/phonenumbers/geodata/data28.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '9168167':{'en': 'Mohana, Odisha'}, - '9168172':{'en': 'R.Udayigiri, Odisha'}, - '9168173':{'en': 'R.Udayigiri, Odisha'}, - '9168174':{'en': 'R.Udayigiri, Odisha'}, - '9168175':{'en': 'R.Udayigiri, Odisha'}, '9168176':{'en': 'R.Udayigiri, Odisha'}, '9168177':{'en': 'R.Udayigiri, Odisha'}, '9168182':{'en': 'Buguda, Odisha'}, diff --git a/python/phonenumbers/geodata/data5.py b/python/phonenumbers/geodata/data5.py index 24073cf6..6cb8b6cc 100644 --- a/python/phonenumbers/geodata/data5.py +++ b/python/phonenumbers/geodata/data5.py @@ -1173,6 +1173,7 @@ '35887':{'en': 'Oulu', 'fi': 'Oulu', 'se': u('Ule\u00e5borg'), 'sv': u('Ule\u00e5borg')}, '35888':{'en': 'Oulu', 'fi': 'Oulu', 'se': u('Ule\u00e5borg'), 'sv': u('Ule\u00e5borg')}, '3589':{'en': 'Helsinki', 'fi': 'Helsinki', 'sv': 'Helsingfors'}, + '35890':{'en': 'Uusimaa', 'fi': 'Uusimaa', 'sv': 'Nyland'}, '35891':{'se': 'Helsingfors'}, '35892':{'se': 'Helsingfors'}, '35893':{'se': 'Helsingfors'}, @@ -10018,5 +10019,4 @@ '494746':{'de': 'Hagen bei Bremerhaven', 'en': 'Hagen bei Bremerhaven'}, '494747':{'de': 'Beverstedt', 'en': 'Beverstedt'}, '494748':{'de': 'Stubben bei Bremerhaven', 'en': 'Stubben bei Bremerhaven'}, - '494749':{'de': 'Schiffdorf-Geestenseth', 'en': 'Schiffdorf-Geestenseth'}, } diff --git a/python/phonenumbers/geodata/data6.py b/python/phonenumbers/geodata/data6.py index 70c44eb4..fc0199cb 100644 --- a/python/phonenumbers/geodata/data6.py +++ b/python/phonenumbers/geodata/data6.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '494749':{'de': 'Schiffdorf-Geestenseth', 'en': 'Schiffdorf-Geestenseth'}, '494751':{'de': 'Otterndorf', 'en': 'Otterndorf'}, '494752':{'de': 'Neuhaus Oste', 'en': 'Neuhaus Oste'}, '494753':{'de': 'Balje', 'en': 'Balje'}, @@ -3727,13 +3728,7 @@ '543868':{'en': 'Cafayate, Salta', 'es': 'Cafayate, Salta'}, '543869':{'en': u('Ranchillos y San Miguel, Tucum\u00e1n'), 'es': u('Ranchillos y San Miguel, Tucum\u00e1n')}, '543872':{'en': 'Salta, Salta', 'es': 'Salta, Salta'}, - '5438730':{'en': 'Tartagal, Salta', 'es': 'Tartagal, Salta'}, - '5438731':{'en': 'Tartagal, Salta', 'es': 'Tartagal, Salta'}, - '5438732':{'en': 'Tartagal, Salta', 'es': 'Tartagal, Salta'}, - '5438733':{'en': 'Tartagal, Salta', 'es': 'Tartagal, Salta'}, - '5438734':{'en': 'Tartagal, Salta', 'es': 'Tartagal, Salta'}, - '5438735':{'en': 'Tartagal, Salta', 'es': 'Tartagal, Salta'}, - '5438736':{'en': 'Tartagal, Salta', 'es': 'Tartagal, Salta'}, + '543873':{'en': 'Tartagal, Salta', 'es': 'Tartagal, Salta'}, '543874':{'en': 'Salta, Salta', 'es': 'Salta, Salta'}, '543875':{'en': 'Salta, Salta', 'es': 'Salta, Salta'}, '543876':{'en': u('San Jos\u00e9 de Met\u00e1n, Salta'), 'es': u('San Jos\u00e9 de Met\u00e1n, Salta')}, @@ -10019,4 +10014,9 @@ '55493312':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, '55493313':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, '55493316':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, + '55493319':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, + '55493321':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, + '55493322':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, + '55493323':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, + '55493325':{'en': u('S\u00e3o Carlos - SC'), 'pt': u('S\u00e3o Carlos - SC')}, } diff --git a/python/phonenumbers/geodata/data7.py b/python/phonenumbers/geodata/data7.py index 12f41322..e8524b57 100644 --- a/python/phonenumbers/geodata/data7.py +++ b/python/phonenumbers/geodata/data7.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '55493319':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, - '55493321':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, - '55493322':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, - '55493323':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, - '55493325':{'en': u('S\u00e3o Carlos - SC'), 'pt': u('S\u00e3o Carlos - SC')}, '55493326':{'en': 'Caxambu do Sul - SC', 'pt': 'Caxambu do Sul - SC'}, '55493327':{'en': 'Nova Itaberaba - SC', 'pt': 'Nova Itaberaba - SC'}, '55493328':{'en': u('Chapec\u00f3 - SC'), 'pt': u('Chapec\u00f3 - SC')}, @@ -10019,4 +10014,9 @@ '609659':{'en': 'Batu Rakit'}, '609660':{'en': 'Kuala Brang'}, '609662':{'en': 'Kuala Brang'}, + '609663':{'en': 'Batu Rakit'}, + '609664':{'en': 'Batu Rakit'}, + '609665':{'en': 'Kuala Brang'}, + '609666':{'en': 'Kuala Brang'}, + '609667':{'en': 'Kuala Brang'}, } diff --git a/python/phonenumbers/geodata/data8.py b/python/phonenumbers/geodata/data8.py index adfe23ac..f2275056 100644 --- a/python/phonenumbers/geodata/data8.py +++ b/python/phonenumbers/geodata/data8.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '609663':{'en': 'Batu Rakit'}, - '609664':{'en': 'Batu Rakit'}, - '609665':{'en': 'Kuala Brang'}, - '609666':{'en': 'Kuala Brang'}, - '609667':{'en': 'Kuala Brang'}, '609668':{'en': 'Batu Rakit'}, '609669':{'en': 'Batu Rakit'}, '609679':{'en': 'Jerteh'}, @@ -10019,4 +10014,9 @@ '61263014':{'en': 'Bathurst'}, '61263015':{'en': 'Bathurst'}, '61263016':{'en': 'Birriwa'}, + '61263017':{'en': 'Birriwa'}, + '61263018':{'en': 'Birriwa'}, + '61263019':{'en': 'Bathurst'}, + '61263020':{'en': 'Blayney'}, + '61263021':{'en': 'Blayney'}, } diff --git a/python/phonenumbers/geodata/data9.py b/python/phonenumbers/geodata/data9.py index d2a7adc1..e2ec707a 100644 --- a/python/phonenumbers/geodata/data9.py +++ b/python/phonenumbers/geodata/data9.py @@ -19,11 +19,6 @@ # limitations under the License. data = { - '61263017':{'en': 'Birriwa'}, - '61263018':{'en': 'Birriwa'}, - '61263019':{'en': 'Bathurst'}, - '61263020':{'en': 'Blayney'}, - '61263021':{'en': 'Blayney'}, '61263022':{'en': 'Blayney'}, '61263023':{'en': 'Boorowa'}, '61263024':{'en': 'Boorowa'}, @@ -10019,4 +10014,9 @@ '61348012':{'en': 'Caldwell'}, '61348013':{'en': 'Cobram'}, '61348014':{'en': 'Conargo'}, + '61348015':{'en': 'Cornalla'}, + '61348016':{'en': 'Deniliquin'}, + '61348017':{'en': 'Dookie'}, + '61348018':{'en': 'Finley'}, + '61348019':{'en': 'Jerilderie'}, } diff --git a/python/phonenumbers/tzdata/data0.py b/python/phonenumbers/tzdata/data0.py index c1a34bbd..41ba6d09 100644 --- a/python/phonenumbers/tzdata/data0.py +++ b/python/phonenumbers/tzdata/data0.py @@ -2163,26 +2163,23 @@ '356':('Europe/Malta',), '357':('Asia/Nicosia',), '358':('Europe/Helsinki', 'Europe/Mariehamn'), - '35813':('Europe/Helsinki',), - '35814':('Europe/Helsinki',), - '35815':('Europe/Helsinki',), - '35816':('Europe/Helsinki',), - '35817':('Europe/Helsinki',), + '3581':('Europe/Helsinki',), + '35810':('Europe/Helsinki', 'Europe/Mariehamn'), '35818':('Europe/Mariehamn',), - '35819':('Europe/Helsinki',), '3582':('Europe/Helsinki',), + '35820':('Europe/Helsinki', 'Europe/Mariehamn'), + '35829':('Europe/Helsinki', 'Europe/Mariehamn'), '3583':('Europe/Helsinki',), + '35830':('Europe/Helsinki', 'Europe/Mariehamn'), + '35839':('Europe/Helsinki', 'Europe/Mariehamn'), + '3584':('Europe/Helsinki', 'Europe/Mariehamn'), '3585':('Europe/Helsinki',), + '35850':('Europe/Helsinki', 'Europe/Mariehamn'), '3586':('Europe/Helsinki',), - '358701':('Europe/Helsinki', 'Europe/Mariehamn'), - '358702':('Europe/Helsinki', 'Europe/Mariehamn'), - '358703':('Europe/Helsinki', 'Europe/Mariehamn'), - '358704':('Europe/Helsinki', 'Europe/Mariehamn'), - '358705':('Europe/Helsinki', 'Europe/Mariehamn'), - '358707':('Europe/Helsinki', 'Europe/Mariehamn'), - '358708':('Europe/Helsinki', 'Europe/Mariehamn'), - '358709':('Europe/Helsinki', 'Europe/Mariehamn'), + '35860':('Europe/Helsinki', 'Europe/Mariehamn'), + '3587':('Europe/Helsinki', 'Europe/Mariehamn'), '3588':('Europe/Helsinki',), + '35880':('Europe/Helsinki', 'Europe/Mariehamn'), '3589':('Europe/Helsinki',), '359':('Europe/Sofia',), '36':('Europe/Budapest',),