From 2bc7cf0d1677a8ad2281516cb2796e8e9e1e6a6f Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Wed, 13 Mar 2024 06:34:09 +0000 Subject: [PATCH] Generated files for metadata --- python/phonenumbers/carrierdata/data0.py | 16 ++++++++-------- python/phonenumbers/carrierdata/data1.py | 6 +++--- python/phonenumbers/carrierdata/data2.py | 3 +++ python/phonenumbers/data/region_CN.py | 3 ++- python/phonenumbers/data/region_GB.py | 2 +- python/phonenumbers/data/region_MC.py | 2 +- python/phonenumbers/data/region_US.py | 4 ++-- python/phonenumbers/data/region_XK.py | 7 ++++--- 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 | 1 + python/phonenumbers/geodata/data5.py | 2 +- 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_CN.py | 5 +++-- python/phonenumbers/shortdata/region_EG.py | 2 +- python/phonenumbers/shortdata/region_KZ.py | 6 +++--- python/phonenumbers/tzdata/data0.py | 2 +- 36 files changed, 56 insertions(+), 49 deletions(-) diff --git a/python/phonenumbers/carrierdata/data0.py b/python/phonenumbers/carrierdata/data0.py index 59e2e78be..c6229d162 100644 --- a/python/phonenumbers/carrierdata/data0.py +++ b/python/phonenumbers/carrierdata/data0.py @@ -981,6 +981,7 @@ '23055':{'en': 'Emtel'}, '230550':{'en': 'Cellplus'}, '230552':{'en': 'MTML'}, + '230553':{'en': 'Cellplus'}, '23057':{'en': 'Cellplus'}, '230571':{'en': 'Emtel'}, '230572':{'en': 'Emtel'}, @@ -3217,21 +3218,22 @@ '373779':{'en': 'IDC'}, '37378':{'en': 'Moldcell'}, '37379':{'en': 'Moldcell'}, - '37433':{'en': 'Beeline', 'ru': u('\u0411\u0438\u043b\u0430\u0439\u043d')}, + '37433':{'en': 'Team Telecom Armenia', 'ru': 'Team Telecom Armenia'}, '37441':{'en': 'Ucom', 'ru': u('\u042e\u043a\u043e\u043c')}, - '37443':{'en': 'Beeline', 'ru': u('\u0411\u0438\u043b\u0430\u0439\u043d')}, + '37443':{'en': 'Team Telecom Armenia', 'ru': 'Team Telecom Armenia'}, '37444':{'en': 'Ucom', 'ru': u('\u042e\u043a\u043e\u043c')}, '37449':{'en': 'VivaCell-MTS', 'ru': u('\u0412\u0438\u0432\u0430\u0421\u0435\u043b\u043b-\u041c\u0422\u0421')}, '3745':{'en': 'Ucom', 'ru': u('\u042e\u043a\u043e\u043c')}, '3747':{'en': 'VivaCell-MTS', 'ru': u('\u0412\u0438\u0432\u0430\u0421\u0435\u043b\u043b-\u041c\u0422\u0421')}, '37488':{'en': 'VivaCell-MTS', 'ru': u('\u0412\u0438\u0432\u0430\u0421\u0435\u043b\u043b-\u041c\u0422\u0421')}, - '37491':{'en': 'Beeline', 'ru': u('\u0411\u0438\u043b\u0430\u0439\u043d')}, + '37491':{'en': 'Team Telecom Armenia', 'ru': 'Team Telecom Armenia'}, '37493':{'en': 'VivaCell-MTS', 'ru': u('\u0412\u0438\u0432\u0430\u0421\u0435\u043b\u043b-\u041c\u0422\u0421')}, '37494':{'en': 'VivaCell-MTS', 'ru': u('\u0412\u0438\u0432\u0430\u0421\u0435\u043b\u043b-\u041c\u0422\u0421')}, '37495':{'en': 'Ucom', 'ru': u('\u042e\u043a\u043e\u043c')}, - '37496':{'en': 'Beeline', 'ru': u('\u0411\u0438\u043b\u0430\u0439\u043d')}, + '37496':{'en': 'Team Telecom Armenia', 'ru': 'Team Telecom Armenia'}, + '37497':{'en': 'Team Telecom Armenia', 'ru': 'Team Telecom Armenia'}, '37498':{'en': 'VivaCell-MTS', 'ru': u('\u0412\u0438\u0432\u0430\u0421\u0435\u043b\u043b-\u041c\u0422\u0421')}, - '37499':{'en': 'Beeline', 'ru': u('\u0411\u0438\u043b\u0430\u0439\u043d')}, + '37499':{'en': 'Team Telecom Armenia', 'ru': 'Team Telecom Armenia'}, '37525':{'be': u('\u0411\u0435\u0421\u0422'), 'en': 'life:)', 'ru': 'life:)'}, '375291':{'be': 'Velcom', 'en': 'Velcom', 'ru': 'Velcom'}, '375292':{'be': u('\u041c\u0422\u0421'), 'en': 'MTS', 'ru': u('\u041c\u0422\u0421')}, @@ -7590,6 +7592,7 @@ '5191926':{'en': 'Claro'}, '5191927':{'en': 'Claro'}, '519198':{'en': 'Entel'}, + '519199':{'en': 'Intermax'}, '5192':{'en': 'Claro'}, '51920':{'en': 'Movistar'}, '51922':{'en': 'Entel'}, @@ -10016,7 +10019,4 @@ '553199175':{'en': 'TIM'}, '553199176':{'en': 'TIM'}, '553199177':{'en': 'TIM'}, - '553199178':{'en': 'TIM'}, - '553199179':{'en': 'TIM'}, - '553199181':{'en': 'TIM'}, } diff --git a/python/phonenumbers/carrierdata/data1.py b/python/phonenumbers/carrierdata/data1.py index 37168a389..3520ae2b9 100644 --- a/python/phonenumbers/carrierdata/data1.py +++ b/python/phonenumbers/carrierdata/data1.py @@ -19,6 +19,9 @@ # limitations under the License. data = { + '553199178':{'en': 'TIM'}, + '553199179':{'en': 'TIM'}, + '553199181':{'en': 'TIM'}, '553199182':{'en': 'TIM'}, '553199183':{'en': 'TIM'}, '553199184':{'en': 'TIM'}, @@ -10016,7 +10019,4 @@ '56996081':{'en': 'Entel'}, '56996082':{'en': 'Entel'}, '56996083':{'en': 'Entel'}, - '56996084':{'en': 'Entel'}, - '56996085':{'en': 'Movistar'}, - '56996086':{'en': 'Movistar'}, } diff --git a/python/phonenumbers/carrierdata/data2.py b/python/phonenumbers/carrierdata/data2.py index a6d01e681..8b14cff16 100644 --- a/python/phonenumbers/carrierdata/data2.py +++ b/python/phonenumbers/carrierdata/data2.py @@ -19,6 +19,9 @@ # limitations under the License. data = { + '56996084':{'en': 'Entel'}, + '56996085':{'en': 'Movistar'}, + '56996086':{'en': 'Movistar'}, '56996087':{'en': 'Movistar'}, '56996088':{'en': 'Movistar'}, '56996089':{'en': 'Movistar'}, diff --git a/python/phonenumbers/data/region_CN.py b/python/phonenumbers/data/region_CN.py index 92fe06283..13f5e5fc1 100644 --- a/python/phonenumbers/data/region_CN.py +++ b/python/phonenumbers/data/region_CN.py @@ -12,7 +12,8 @@ preferred_international_prefix='00', national_prefix='0', national_prefix_for_parsing='(1(?:[12]\\d|79)\\d\\d)|0', - number_format=[NumberFormat(pattern='(\\d{5,6})', format='\\1', leading_digits_pattern=['10|96']), + number_format=[NumberFormat(pattern='(\\d{5,6})', format='\\1', leading_digits_pattern=['1(?:00|2[13])|95', '1(?:00|2(?:11|39))|95', '1(?:00|2(?:110|395))|95']), + NumberFormat(pattern='(\\d{5,6})', format='\\1', leading_digits_pattern=['10|96']), NumberFormat(pattern='(\\d{2})(\\d{5,6})', format='\\1 \\2', leading_digits_pattern=['(?:10|2[0-57-9])[19]', '(?:10|2[0-57-9])(?:10|9[56])', '10(?:10|9[56])|2[0-57-9](?:100|9[56])'], national_prefix_formatting_rule='0\\1', domestic_carrier_code_formatting_rule='$CC \\1'), NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[1-9]', '1[1-9]|26|[3-9]|(?:10|2[0-57-9])(?:[0-8]|9[0-47-9])', '1(?:0(?:[0-8]|9[0-47-9])|[1-9])|2(?:[0-57-9](?:[02-8]|1(?:0[1-9]|[1-9])|9[0-47-9])|6)|[3-9]']), NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['16[08]']), diff --git a/python/phonenumbers/data/region_GB.py b/python/phonenumbers/data/region_GB.py index d453dffc1..9736f40b0 100644 --- a/python/phonenumbers/data/region_GB.py +++ b/python/phonenumbers/data/region_GB.py @@ -3,7 +3,7 @@ PHONE_METADATA_GB = PhoneMetadata(id='GB', country_code=44, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='[1-357-9]\\d{9}|[18]\\d{8}|8\\d{6}', possible_length=(7, 9, 10), possible_length_local_only=(4, 5, 6, 8)), - fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:[0-5]\\d\\d|69[7-9]|70[0-79])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[0-2]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}', example_number='1212345678', possible_length=(9, 10), possible_length_local_only=(4, 5, 6, 7, 8)), + fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:1(?:3(?:[0-58]\\d\\d|73[0235])|4(?:(?:[0-5]\\d|70)\\d|69[7-9])|(?:(?:5[0-26-9]|[78][0-49])\\d|6(?:[0-4]\\d|50))\\d)|(?:2(?:(?:0[024-9]|2[3-9]|3[3-79]|4[1-689]|[58][02-9]|6[0-47-9]|7[013-9]|9\\d)\\d|1(?:[0-7]\\d|8[0-2]))|(?:3(?:0\\d|1[0-8]|[25][02-9]|3[02-579]|[468][0-46-9]|7[1-35-79]|9[2-578])|4(?:0[03-9]|[137]\\d|[28][02-57-9]|4[02-69]|5[0-8]|[69][0-79])|5(?:0[1-35-9]|[16]\\d|2[024-9]|3[015689]|4[02-9]|5[03-9]|7[0-35-9]|8[0-468]|9[0-57-9])|6(?:0[034689]|1\\d|2[0-35689]|[38][013-9]|4[1-467]|5[0-69]|6[13-9]|7[0-8]|9[0-24578])|7(?:0[0246-9]|2\\d|3[0236-8]|4[03-9]|5[0-46-9]|6[013-9]|7[0-35-9]|8[024-9]|9[02-9])|8(?:0[35-9]|2[1-57-9]|3[02-578]|4[0-578]|5[124-9]|6[2-69]|7\\d|8[02-9]|9[02569])|9(?:0[02-589]|[18]\\d|2[02-689]|3[1-57-9]|4[2-9]|5[0-579]|6[2-47-9]|7[0-24578]|9[2-57]))\\d)\\d)|2(?:0[013478]|3[0189]|4[017]|8[0-46-9]|9[0-2])\\d{3})\\d{4}|1(?:2(?:0(?:46[1-4]|87[2-9])|545[1-79]|76(?:2\\d|3[1-8]|6[1-6])|9(?:7(?:2[0-4]|3[2-5])|8(?:2[2-8]|7[0-47-9]|8[3-5])))|3(?:6(?:38[2-5]|47[23])|8(?:47[04-9]|64[0157-9]))|4(?:044[1-7]|20(?:2[23]|8\\d)|6(?:0(?:30|5[2-57]|6[1-8]|7[2-8])|140)|8(?:052|87[1-3]))|5(?:2(?:4(?:3[2-79]|6\\d)|76\\d)|6(?:26[06-9]|686))|6(?:06(?:4\\d|7[4-79])|295[5-7]|35[34]\\d|47(?:24|61)|59(?:5[08]|6[67]|74)|9(?:55[0-4]|77[23]))|7(?:26(?:6[13-9]|7[0-7])|(?:442|688)\\d|50(?:2[0-3]|[3-68]2|76))|8(?:27[56]\\d|37(?:5[2-5]|8[239])|843[2-58])|9(?:0(?:0(?:6[1-8]|85)|52\\d)|3583|4(?:66[1-8]|9(?:2[01]|81))|63(?:23|3[1-4])|9561))\\d{3}', example_number='1212345678', possible_length=(9, 10), possible_length_local_only=(4, 5, 6, 7, 8)), mobile=PhoneNumberDesc(national_number_pattern='7(?:457[0-57-9]|700[01]|911[028])\\d{5}|7(?:[1-3]\\d\\d|4(?:[0-46-9]\\d|5[0-689])|5(?:0[0-8]|[13-9]\\d|2[0-35-9])|7(?:0[1-9]|[1-7]\\d|8[02-9]|9[0-689])|8(?:[014-9]\\d|[23][0-8])|9(?:[024-9]\\d|1[02-9]|3[0-689]))\\d{6}', example_number='7400123456', possible_length=(10,)), toll_free=PhoneNumberDesc(national_number_pattern='80[08]\\d{7}|800\\d{6}|8001111', example_number='8001234567', possible_length=(7, 9, 10)), premium_rate=PhoneNumberDesc(national_number_pattern='(?:8(?:4[2-5]|7[0-3])|9(?:[01]\\d|8[2-49]))\\d{7}|845464\\d', example_number='9012345678', possible_length=(7, 10)), diff --git a/python/phonenumbers/data/region_MC.py b/python/phonenumbers/data/region_MC.py index 6bb894434..1f6f0f2a2 100644 --- a/python/phonenumbers/data/region_MC.py +++ b/python/phonenumbers/data/region_MC.py @@ -4,7 +4,7 @@ PHONE_METADATA_MC = PhoneMetadata(id='MC', country_code=377, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='(?:[3489]|6\\d)\\d{7}', possible_length=(8, 9)), fixed_line=PhoneNumberDesc(national_number_pattern='(?:870|9[2-47-9]\\d)\\d{5}', example_number='99123456', possible_length=(8,)), - mobile=PhoneNumberDesc(national_number_pattern='4(?:[46]\\d|5[1-9])\\d{5}|(?:3|6\\d)\\d{7}', example_number='612345678', possible_length=(8, 9)), + mobile=PhoneNumberDesc(national_number_pattern='4(?:[469]\\d|5[1-9])\\d{5}|(?:3|6\\d)\\d{7}', example_number='612345678', possible_length=(8, 9)), toll_free=PhoneNumberDesc(national_number_pattern='(?:800|90\\d)\\d{5}', example_number='90123456', possible_length=(8,)), no_international_dialling=PhoneNumberDesc(national_number_pattern='8[07]0\\d{5}', possible_length=(8,)), national_prefix='0', diff --git a/python/phonenumbers/data/region_US.py b/python/phonenumbers/data/region_US.py index 1a06fefb8..2ba03077b 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])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[237-9])\\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[01349]|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]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|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])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[237-9])\\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[01349]|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]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|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])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\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[01349]|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]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|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])|7302[0-3]\\d)\\d{4}|(?:472[24]|505[2-57-9]|7306|983[2-47-9])\\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[01349]|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]|3[016]|4[0156]|5[01679]|6[0-279]|78|8[0-29])|7(?:0[1-46-8]|1[2-9]|2[04-8]|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/data/region_XK.py b/python/phonenumbers/data/region_XK.py index 20201f7f5..6e7ef398d 100644 --- a/python/phonenumbers/data/region_XK.py +++ b/python/phonenumbers/data/region_XK.py @@ -2,8 +2,8 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata PHONE_METADATA_XK = PhoneMetadata(id='XK', country_code=383, international_prefix='00', - general_desc=PhoneNumberDesc(national_number_pattern='[23]\\d{7,8}|(?:4\\d\\d|[89]00)\\d{5}', possible_length=(8, 9)), - fixed_line=PhoneNumberDesc(national_number_pattern='(?:2[89]|39)0\\d{6}|[23][89]\\d{6}', example_number='28012345', possible_length=(8, 9)), + general_desc=PhoneNumberDesc(national_number_pattern='2\\d{7,8}|3\\d{7,11}|(?:4\\d\\d|[89]00)\\d{5}', possible_length=(8, 9, 10, 11, 12)), + fixed_line=PhoneNumberDesc(national_number_pattern='38\\d{6,10}|(?:2[89]|39)(?:0\\d{5,6}|[1-9]\\d{5})', example_number='28012345', possible_length=(8, 9, 10, 11, 12)), mobile=PhoneNumberDesc(national_number_pattern='4[3-9]\\d{6}', example_number='43201234', possible_length=(8,)), toll_free=PhoneNumberDesc(national_number_pattern='800\\d{5}', example_number='80001234', possible_length=(8,)), premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{5}', example_number='90001234', possible_length=(8,)), @@ -11,4 +11,5 @@ national_prefix_for_parsing='0', number_format=[NumberFormat(pattern='(\\d{3})(\\d{5})', format='\\1 \\2', leading_digits_pattern=['[89]'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[2-4]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[23]'], national_prefix_formatting_rule='0\\1')]) + NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['2|39'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{2})(\\d{7,10})', format='\\1 \\2', leading_digits_pattern=['3'], national_prefix_formatting_rule='0\\1')]) diff --git a/python/phonenumbers/geodata/data10.py b/python/phonenumbers/geodata/data10.py index 4d5ec6af2..a57e9d853 100644 --- a/python/phonenumbers/geodata/data10.py +++ b/python/phonenumbers/geodata/data10.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '61350400':{'en': 'Annuello'}, '61350401':{'en': 'Curyo'}, '61350402':{'en': 'Hopetoun'}, '61350403':{'en': 'Patchewollock'}, @@ -10018,5 +10019,4 @@ '61728022':{'en': 'Cleveland'}, '61728023':{'en': 'Ipswich'}, '6172889':{'en': 'Beenleigh'}, - '6172891':{'en': 'Beenleigh'}, } diff --git a/python/phonenumbers/geodata/data11.py b/python/phonenumbers/geodata/data11.py index 30ef7620d..f684954e3 100644 --- a/python/phonenumbers/geodata/data11.py +++ b/python/phonenumbers/geodata/data11.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '6172891':{'en': 'Beenleigh'}, '6173018':{'en': 'Brisbane'}, '6173019':{'en': 'Brisbane'}, '617303':{'en': 'Brisbane'}, @@ -10018,5 +10019,4 @@ '61752939':{'en': 'Nambour'}, '6175294':{'en': 'Nambour'}, '61752947':{'en': 'Caboolture'}, - '61752948':{'en': 'Caboolture'}, } diff --git a/python/phonenumbers/geodata/data12.py b/python/phonenumbers/geodata/data12.py index 3bce84b9a..81eaf4dbd 100644 --- a/python/phonenumbers/geodata/data12.py +++ b/python/phonenumbers/geodata/data12.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '61752948':{'en': 'Caboolture'}, '61752949':{'en': 'Caboolture'}, '61753000':{'en': 'Rosevale'}, '61753001':{'en': 'Rosewood'}, @@ -10018,5 +10019,4 @@ '61885892':{'en': 'Kingscote'}, '61885893':{'en': 'Lowbank'}, '61885894':{'en': 'Lowbank'}, - '61885895':{'en': 'Yankalilla'}, } diff --git a/python/phonenumbers/geodata/data13.py b/python/phonenumbers/geodata/data13.py index e50d645ff..7954ffac9 100644 --- a/python/phonenumbers/geodata/data13.py +++ b/python/phonenumbers/geodata/data13.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '61885895':{'en': 'Yankalilla'}, '61885897':{'en': 'Mantung'}, '61885898':{'en': 'Mantung'}, '61885899':{'en': 'Willunga'}, @@ -10018,5 +10019,4 @@ '61899377':{'en': 'Morawa'}, '61899378':{'en': 'Morawa'}, '61899379':{'en': 'Geraldton'}, - '6189938':{'en': 'Geraldton'}, } diff --git a/python/phonenumbers/geodata/data14.py b/python/phonenumbers/geodata/data14.py index 875d16bfc..9e891057b 100644 --- a/python/phonenumbers/geodata/data14.py +++ b/python/phonenumbers/geodata/data14.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '6189938':{'en': 'Geraldton'}, '61899385':{'en': 'Northampton'}, '61899386':{'en': 'Northampton'}, '61899387':{'en': 'Northern Gully'}, @@ -10018,5 +10019,4 @@ '861308395':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')}, '861308396':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')}, '861308397':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')}, - '861308398':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')}, } diff --git a/python/phonenumbers/geodata/data15.py b/python/phonenumbers/geodata/data15.py index 86f27b069..f3c55f6c5 100644 --- a/python/phonenumbers/geodata/data15.py +++ b/python/phonenumbers/geodata/data15.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861308398':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')}, '861308399':{'en': 'Hangzhou, Zhejiang', 'zh': u('\u6d59\u6c5f\u7701\u676d\u5dde\u5e02')}, '861308400':{'en': 'Suzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5bbf\u5dde\u5e02')}, '861308401':{'en': 'Suzhou, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5bbf\u5dde\u5e02')}, @@ -10018,5 +10019,4 @@ '861324910':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')}, '861324911':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')}, '861324912':{'en': 'Jiangmen, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6c5f\u95e8\u5e02')}, - '86132492':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')}, } diff --git a/python/phonenumbers/geodata/data16.py b/python/phonenumbers/geodata/data16.py index 7741d6ef9..3e3965f5d 100644 --- a/python/phonenumbers/geodata/data16.py +++ b/python/phonenumbers/geodata/data16.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '86132492':{'en': 'Foshan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u4f5b\u5c71\u5e02')}, '861324930':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')}, '861324931':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')}, '861324932':{'en': 'Huizhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u60e0\u5dde\u5e02')}, @@ -10018,5 +10019,4 @@ '861341347':{'en': 'Qingyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e05\u8fdc\u5e02')}, '861341348':{'en': 'Qingyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e05\u8fdc\u5e02')}, '861341349':{'en': 'Qingyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e05\u8fdc\u5e02')}, - '86134135':{'en': 'Qingyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e05\u8fdc\u5e02')}, } diff --git a/python/phonenumbers/geodata/data17.py b/python/phonenumbers/geodata/data17.py index c4585a3b1..c33babaa4 100644 --- a/python/phonenumbers/geodata/data17.py +++ b/python/phonenumbers/geodata/data17.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '86134135':{'en': 'Qingyuan, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e05\u8fdc\u5e02')}, '86134136':{'en': 'Zhanjiang, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6e5b\u6c5f\u5e02')}, '86134137':{'en': 'Chaozhou, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u6f6e\u5dde\u5e02')}, '86134138':{'en': 'Zhaoqing, Guangdong', 'zh': u('\u5e7f\u4e1c\u7701\u8087\u5e86\u5e02')}, @@ -10018,5 +10019,4 @@ '861365954':{'en': 'Lhasa, Tibet', 'zh': u('\u897f\u85cf\u62c9\u8428\u5e02')}, '861365955':{'en': 'Qamdo, Tibet', 'zh': u('\u897f\u85cf\u660c\u90fd\u5730\u533a')}, '861365956':{'en': 'Xigaze, Tibet', 'zh': u('\u897f\u85cf\u65e5\u5580\u5219\u5730\u533a')}, - '861365957':{'en': 'Xigaze, Tibet', 'zh': u('\u897f\u85cf\u65e5\u5580\u5219\u5730\u533a')}, } diff --git a/python/phonenumbers/geodata/data18.py b/python/phonenumbers/geodata/data18.py index b8fc58dd0..9f62cb4ef 100644 --- a/python/phonenumbers/geodata/data18.py +++ b/python/phonenumbers/geodata/data18.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861365957':{'en': 'Xigaze, Tibet', 'zh': u('\u897f\u85cf\u65e5\u5580\u5219\u5730\u533a')}, '861365958':{'en': 'Shannan, Tibet', 'zh': u('\u897f\u85cf\u5c71\u5357\u5730\u533a')}, '861365959':{'en': 'Nyingchi, Tibet', 'zh': u('\u897f\u85cf\u6797\u829d\u5730\u533a')}, '861365960':{'en': 'Nanning, Guangxi', 'zh': u('\u5e7f\u897f\u5357\u5b81\u5e02')}, @@ -10018,5 +10019,4 @@ '861396667':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')}, '861396668':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')}, '861396669':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')}, - '86139667':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')}, } diff --git a/python/phonenumbers/geodata/data19.py b/python/phonenumbers/geodata/data19.py index 2a73c84cd..04bf68f76 100644 --- a/python/phonenumbers/geodata/data19.py +++ b/python/phonenumbers/geodata/data19.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '86139667':{'en': 'Hefei, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u5408\u80a5\u5e02')}, '861396680':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')}, '861396681':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')}, '861396682':{'en': 'Fuyang, Anhui', 'zh': u('\u5b89\u5fbd\u7701\u961c\u9633\u5e02')}, @@ -10018,5 +10019,4 @@ '861508230':{'en': 'Garze, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7518\u5b5c\u85cf\u65cf\u81ea\u6cbb\u5dde')}, '861508231':{'en': 'Garze, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7518\u5b5c\u85cf\u65cf\u81ea\u6cbb\u5dde')}, '861508232':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')}, - '861508233':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')}, } diff --git a/python/phonenumbers/geodata/data20.py b/python/phonenumbers/geodata/data20.py index ffa2b48dc..8834cf6c8 100644 --- a/python/phonenumbers/geodata/data20.py +++ b/python/phonenumbers/geodata/data20.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861508233':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')}, '861508234':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')}, '861508235':{'en': 'Meishan, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u7709\u5c71\u5e02')}, '861508236':{'en': 'Panzhihua, Sichuan', 'zh': u('\u56db\u5ddd\u7701\u6500\u679d\u82b1\u5e02')}, @@ -10018,5 +10019,4 @@ '861534528':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, '861534529':{'en': 'Yancheng, Jiangsu', 'zh': u('\u6c5f\u82cf\u7701\u76d0\u57ce\u5e02')}, '861534530':{'en': 'Heze, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u83cf\u6cfd\u5e02')}, - '861534531':{'en': 'Jinan, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5357\u5e02')}, } diff --git a/python/phonenumbers/geodata/data21.py b/python/phonenumbers/geodata/data21.py index 05a0e3050..5d3f02547 100644 --- a/python/phonenumbers/geodata/data21.py +++ b/python/phonenumbers/geodata/data21.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861534531':{'en': 'Jinan, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6d4e\u5357\u5e02')}, '861534532':{'en': 'Qingdao, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u9752\u5c9b\u5e02')}, '861534533':{'en': 'Zibo, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u6dc4\u535a\u5e02')}, '861534534':{'en': 'Dezhou, Shandong', 'zh': u('\u5c71\u4e1c\u7701\u5fb7\u5dde\u5e02')}, @@ -10018,5 +10019,4 @@ '861568545':{'en': 'Qiandongnan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u4e1c\u5357\u82d7\u65cf\u4f97\u65cf\u81ea\u6cbb\u5dde')}, '861568546':{'en': 'Tongren, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u94dc\u4ec1\u5730\u533a')}, '861568547':{'en': 'Bijie, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u6bd5\u8282\u5730\u533a')}, - '861568548':{'en': 'Liupanshui, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u516d\u76d8\u6c34\u5e02')}, } diff --git a/python/phonenumbers/geodata/data22.py b/python/phonenumbers/geodata/data22.py index b766fb340..22a6ab130 100644 --- a/python/phonenumbers/geodata/data22.py +++ b/python/phonenumbers/geodata/data22.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861568548':{'en': 'Liupanshui, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u516d\u76d8\u6c34\u5e02')}, '861568549':{'en': 'Qianxinan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u897f\u5357\u5e03\u4f9d\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')}, '86156855':{'en': 'Qiandongnan, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u9ed4\u4e1c\u5357\u82d7\u65cf\u4f97\u65cf\u81ea\u6cbb\u5dde')}, '861568550':{'en': 'Guiyang, Guizhou', 'zh': u('\u8d35\u5dde\u7701\u8d35\u9633\u5e02')}, @@ -10018,5 +10019,4 @@ '861596048':{'en': 'Ningde, Fujian', 'zh': u('\u798f\u5efa\u7701\u5b81\u5fb7\u5e02')}, '861596049':{'en': 'Ningde, Fujian', 'zh': u('\u798f\u5efa\u7701\u5b81\u5fb7\u5e02')}, '861596050':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')}, - '861596051':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')}, } diff --git a/python/phonenumbers/geodata/data23.py b/python/phonenumbers/geodata/data23.py index 02737daea..add3fdde7 100644 --- a/python/phonenumbers/geodata/data23.py +++ b/python/phonenumbers/geodata/data23.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861596051':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')}, '861596052':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')}, '861596053':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')}, '861596054':{'en': 'Putian, Fujian', 'zh': u('\u798f\u5efa\u7701\u8386\u7530\u5e02')}, @@ -10018,5 +10019,4 @@ '861787772':{'en': 'Hengyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u8861\u9633\u5e02')}, '861787773':{'en': 'Huaihua, Hunan', 'zh': u('\u6e56\u5357\u7701\u6000\u5316\u5e02')}, '861787774':{'en': 'Shaoyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u90b5\u9633\u5e02')}, - '861787775':{'en': 'Yongzhou, Hunan', 'zh': u('\u6e56\u5357\u7701\u6c38\u5dde\u5e02')}, } diff --git a/python/phonenumbers/geodata/data24.py b/python/phonenumbers/geodata/data24.py index ec83a8234..86cdba90a 100644 --- a/python/phonenumbers/geodata/data24.py +++ b/python/phonenumbers/geodata/data24.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861787775':{'en': 'Yongzhou, Hunan', 'zh': u('\u6e56\u5357\u7701\u6c38\u5dde\u5e02')}, '861787776':{'en': 'Zhangjiajie, Hunan', 'zh': u('\u6e56\u5357\u7701\u5f20\u5bb6\u754c\u5e02')}, '861787777':{'en': 'Xiangxi, Hunan', 'zh': u('\u6e56\u5357\u7701\u6e58\u897f\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')}, '861787778':{'en': 'Changsha, Hunan', 'zh': u('\u6e56\u5357\u7701\u957f\u6c99\u5e02')}, @@ -10018,5 +10019,4 @@ '861820959':{'en': 'Guyuan, Ningxia', 'zh': u('\u5b81\u590f\u56fa\u539f\u5e02')}, '861820960':{'en': 'Yinchuan, Ningxia', 'zh': u('\u5b81\u590f\u94f6\u5ddd\u5e02')}, '861820961':{'en': 'Yinchuan, Ningxia', 'zh': u('\u5b81\u590f\u94f6\u5ddd\u5e02')}, - '861820962':{'en': 'Shizuishan, Ningxia', 'zh': u('\u5b81\u590f\u77f3\u5634\u5c71\u5e02')}, } diff --git a/python/phonenumbers/geodata/data25.py b/python/phonenumbers/geodata/data25.py index 0256a43cb..b6cc9f13a 100644 --- a/python/phonenumbers/geodata/data25.py +++ b/python/phonenumbers/geodata/data25.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861820962':{'en': 'Shizuishan, Ningxia', 'zh': u('\u5b81\u590f\u77f3\u5634\u5c71\u5e02')}, '861820963':{'en': 'Wuzhong, Ningxia', 'zh': u('\u5b81\u590f\u5434\u5fe0\u5e02')}, '861820964':{'en': 'Guyuan, Ningxia', 'zh': u('\u5b81\u590f\u56fa\u539f\u5e02')}, '861820965':{'en': 'Zhongwei, Ningxia', 'zh': u('\u5b81\u590f\u4e2d\u536b\u5e02')}, @@ -10018,5 +10019,4 @@ '86185690':{'en': 'Changsha, Hunan', 'zh': u('\u6e56\u5357\u7701\u957f\u6c99\u5e02')}, '861856900':{'en': 'Zhuzhou, Hunan', 'zh': u('\u6e56\u5357\u7701\u682a\u6d32\u5e02')}, '861856901':{'en': 'Zhuzhou, Hunan', 'zh': u('\u6e56\u5357\u7701\u682a\u6d32\u5e02')}, - '861856902':{'en': 'Hengyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u8861\u9633\u5e02')}, } diff --git a/python/phonenumbers/geodata/data26.py b/python/phonenumbers/geodata/data26.py index 227508217..9759c2de4 100644 --- a/python/phonenumbers/geodata/data26.py +++ b/python/phonenumbers/geodata/data26.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861856902':{'en': 'Hengyang, Hunan', 'zh': u('\u6e56\u5357\u7701\u8861\u9633\u5e02')}, '861856909':{'en': 'Xiangxi, Hunan', 'zh': u('\u6e56\u5357\u7701\u6e58\u897f\u571f\u5bb6\u65cf\u82d7\u65cf\u81ea\u6cbb\u5dde')}, '86185691':{'en': 'Changde, Hunan', 'zh': u('\u6e56\u5357\u7701\u5e38\u5fb7\u5e02')}, '861856919':{'en': 'Zhangjiajie, Hunan', 'zh': u('\u6e56\u5357\u7701\u5f20\u5bb6\u754c\u5e02')}, @@ -10018,5 +10019,4 @@ '861883845':{'en': 'Shangqiu, Henan', 'zh': u('\u6cb3\u5357\u7701\u5546\u4e18\u5e02')}, '861883846':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')}, '861883847':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')}, - '861883848':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')}, } diff --git a/python/phonenumbers/geodata/data27.py b/python/phonenumbers/geodata/data27.py index bc4cd07ca..1a03b2cd8 100644 --- a/python/phonenumbers/geodata/data27.py +++ b/python/phonenumbers/geodata/data27.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '861883848':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')}, '861883849':{'en': 'Pingdingshan, Henan', 'zh': u('\u6cb3\u5357\u7701\u5e73\u9876\u5c71\u5e02')}, '86188385':{'en': 'Zhumadian, Henan', 'zh': u('\u6cb3\u5357\u7701\u9a7b\u9a6c\u5e97\u5e02')}, '861883856':{'en': 'Xuchang, Henan', 'zh': u('\u6cb3\u5357\u7701\u8bb8\u660c\u5e02')}, @@ -10018,5 +10019,4 @@ '9171827':{'en': 'Gondia, Maharashtra'}, '9171832':{'en': 'Tumsar, Maharashtra'}, '9171833':{'en': 'Tumsar, Maharashtra'}, - '9171834':{'en': 'Tumsar, Maharashtra'}, } diff --git a/python/phonenumbers/geodata/data28.py b/python/phonenumbers/geodata/data28.py index 714efcd36..8c72f1b60 100644 --- a/python/phonenumbers/geodata/data28.py +++ b/python/phonenumbers/geodata/data28.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '9171834':{'en': 'Tumsar, Maharashtra'}, '9171835':{'en': 'Tumsar, Maharashtra'}, '9171836':{'en': 'Tumsar, Maharashtra'}, '9171837':{'en': 'Tumsar, Maharashtra'}, diff --git a/python/phonenumbers/geodata/data5.py b/python/phonenumbers/geodata/data5.py index a531de3dd..d809fdb76 100644 --- a/python/phonenumbers/geodata/data5.py +++ b/python/phonenumbers/geodata/data5.py @@ -6340,6 +6340,7 @@ '44114704':{'en': 'Sheffield'}, '44114705':{'en': 'Sheffield'}, '44114707':{'en': 'Sheffield'}, + '44114708':{'en': 'Sheffield'}, '44114709':{'en': 'Sheffield'}, '44115':{'en': 'Nottingham'}, '44116':{'en': 'Leicester'}, @@ -10018,5 +10019,4 @@ '494761':{'de': u('Bremerv\u00f6rde'), 'en': u('Bremerv\u00f6rde')}, '494762':{'de': 'Kutenholz', 'en': 'Kutenholz'}, '494763':{'de': 'Gnarrenburg', 'en': 'Gnarrenburg'}, - '494764':{'de': 'Gnarrenburg-Klenkendorf', 'en': 'Gnarrenburg-Klenkendorf'}, } diff --git a/python/phonenumbers/geodata/data6.py b/python/phonenumbers/geodata/data6.py index ea36c8bb8..f229d9cc2 100644 --- a/python/phonenumbers/geodata/data6.py +++ b/python/phonenumbers/geodata/data6.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '494764':{'de': 'Gnarrenburg-Klenkendorf', 'en': 'Gnarrenburg-Klenkendorf'}, '494765':{'de': u('Ebersdorf bei Bremerv\u00f6rde'), 'en': u('Ebersdorf bei Bremerv\u00f6rde')}, '494766':{'de': 'Basdahl', 'en': 'Basdahl'}, '494767':{'de': u('Bremerv\u00f6rde-Bevern'), 'en': u('Bremerv\u00f6rde-Bevern')}, @@ -10018,5 +10019,4 @@ '55493335':{'en': 'Planalto Alegre - SC', 'pt': 'Planalto Alegre - SC'}, '55493336':{'en': u('Guatamb\u00fa - SC'), 'pt': u('Guatamb\u00fa - SC')}, '55493337':{'en': u('Jardin\u00f3polis - SC'), 'pt': u('Jardin\u00f3polis - SC')}, - '55493338':{'en': u('Cunhata\u00ed - SC'), 'pt': u('Cunhata\u00ed - SC')}, } diff --git a/python/phonenumbers/geodata/data7.py b/python/phonenumbers/geodata/data7.py index 8ae2ebac3..b7c2390eb 100644 --- a/python/phonenumbers/geodata/data7.py +++ b/python/phonenumbers/geodata/data7.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '55493338':{'en': u('Cunhata\u00ed - SC'), 'pt': u('Cunhata\u00ed - SC')}, '55493339':{'en': u('\u00c1guas de Chapec\u00f3 - SC'), 'pt': u('\u00c1guas de Chapec\u00f3 - SC')}, '55493341':{'en': u('Jupi\u00e1 - SC'), 'pt': u('Jupi\u00e1 - SC')}, '55493342':{'en': u('Galv\u00e3o - SC'), 'pt': u('Galv\u00e3o - SC')}, @@ -10018,5 +10019,4 @@ '609685':{'en': 'Kuala Brang'}, '609686':{'en': 'Kuala Brang'}, '609687':{'en': 'Bukit Bading'}, - '609688':{'en': 'Kuala Brang'}, } diff --git a/python/phonenumbers/geodata/data8.py b/python/phonenumbers/geodata/data8.py index 6a7284599..1d138536b 100644 --- a/python/phonenumbers/geodata/data8.py +++ b/python/phonenumbers/geodata/data8.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '609688':{'en': 'Kuala Brang'}, '60969':{'en': 'Jerteh'}, '609700':{'en': 'Kota Bharu'}, '609701':{'en': 'Kota Bharu'}, @@ -10018,5 +10019,4 @@ '61263799':{'en': 'Bylong'}, '61263800':{'en': 'Murringo'}, '61263801':{'en': 'Young'}, - '61263802':{'en': 'Boorowa'}, } diff --git a/python/phonenumbers/geodata/data9.py b/python/phonenumbers/geodata/data9.py index 758938966..aa6352bd4 100644 --- a/python/phonenumbers/geodata/data9.py +++ b/python/phonenumbers/geodata/data9.py @@ -19,6 +19,7 @@ # limitations under the License. data = { + '61263802':{'en': 'Boorowa'}, '61263803':{'en': 'Bribbaree'}, '61263804':{'en': 'Frogmore'}, '61263805':{'en': 'Galong'}, @@ -10018,5 +10019,4 @@ '61350397':{'en': 'Ultima'}, '61350398':{'en': 'Ultima'}, '61350399':{'en': 'Ultima'}, - '61350400':{'en': 'Annuello'}, } diff --git a/python/phonenumbers/shortdata/region_CN.py b/python/phonenumbers/shortdata/region_CN.py index ce8dff1f5..d9aae5556 100644 --- a/python/phonenumbers/shortdata/region_CN.py +++ b/python/phonenumbers/shortdata/region_CN.py @@ -3,8 +3,9 @@ PHONE_METADATA_CN = PhoneMetadata(id='CN', country_code=None, international_prefix=None, general_desc=PhoneNumberDesc(national_number_pattern='[19]\\d\\d(?:\\d{2,3})?', possible_length=(3, 5, 6)), - toll_free=PhoneNumberDesc(national_number_pattern='1(?:1[09]|20)', example_number='110', possible_length=(3,)), + toll_free=PhoneNumberDesc(national_number_pattern='1(?:1[09]|2(?:[02]|[13]\\d\\d))', example_number='110', possible_length=(3, 5)), emergency=PhoneNumberDesc(national_number_pattern='1(?:1[09]|20)', example_number='110', possible_length=(3,)), - short_code=PhoneNumberDesc(national_number_pattern='1(?:00\\d\\d|1[029]|20)|95\\d{3,4}', example_number='110', possible_length=(3, 5, 6)), + short_code=PhoneNumberDesc(national_number_pattern='1(?:00\\d\\d|1[029]|2(?:[02]|110|395))|95\\d{3,4}', example_number='110', possible_length=(3, 5, 6)), standard_rate=PhoneNumberDesc(national_number_pattern='1(?:00\\d\\d|12)|95\\d{3,4}', example_number='112', possible_length=(3, 5, 6)), + sms_services=PhoneNumberDesc(national_number_pattern='121\\d\\d', example_number='12100', possible_length=(5,)), short_data=True) diff --git a/python/phonenumbers/shortdata/region_EG.py b/python/phonenumbers/shortdata/region_EG.py index a863023e6..2873e069c 100644 --- a/python/phonenumbers/shortdata/region_EG.py +++ b/python/phonenumbers/shortdata/region_EG.py @@ -5,7 +5,7 @@ general_desc=PhoneNumberDesc(national_number_pattern='[13]\\d\\d(?:\\d{2})?', possible_length=(3, 5)), toll_free=PhoneNumberDesc(national_number_pattern='1(?:2[23]|80)', example_number='122', possible_length=(3,)), emergency=PhoneNumberDesc(national_number_pattern='1(?:2[23]|80)', example_number='122', possible_length=(3,)), - short_code=PhoneNumberDesc(national_number_pattern='1(?:2[23]|[69]\\d{3}|80)|34400', example_number='122', possible_length=(3, 5)), + short_code=PhoneNumberDesc(national_number_pattern='1(?:2[23]|[679]\\d{3}|80)|34400', example_number='122', possible_length=(3, 5)), carrier_specific=PhoneNumberDesc(national_number_pattern='344\\d\\d', example_number='34400', possible_length=(5,)), sms_services=PhoneNumberDesc(national_number_pattern='344\\d\\d', example_number='34400', possible_length=(5,)), short_data=True) diff --git a/python/phonenumbers/shortdata/region_KZ.py b/python/phonenumbers/shortdata/region_KZ.py index 0ab719317..dcd74f745 100644 --- a/python/phonenumbers/shortdata/region_KZ.py +++ b/python/phonenumbers/shortdata/region_KZ.py @@ -2,10 +2,10 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata PHONE_METADATA_KZ = PhoneMetadata(id='KZ', country_code=None, international_prefix=None, - general_desc=PhoneNumberDesc(national_number_pattern='[134]\\d{2,4}', possible_length=(3, 4, 5)), - toll_free=PhoneNumberDesc(national_number_pattern='1(?:0[1-3]|12)', example_number='101', possible_length=(3,)), + general_desc=PhoneNumberDesc(national_number_pattern='[1-4]\\d{2,4}', possible_length=(3, 4, 5)), + toll_free=PhoneNumberDesc(national_number_pattern='1(?:0[1-3]|12)|212\\d', example_number='101', possible_length=(3, 4)), emergency=PhoneNumberDesc(national_number_pattern='1(?:0[1-3]|12)', example_number='101', possible_length=(3,)), - short_code=PhoneNumberDesc(national_number_pattern='1(?:0[1-4]|12)|(?:3040|404)0', example_number='101', possible_length=(3, 4, 5)), + short_code=PhoneNumberDesc(national_number_pattern='1(?:0[1-4]|12)|2121|(?:3040|404)0', example_number='101', possible_length=(3, 4, 5)), carrier_specific=PhoneNumberDesc(national_number_pattern='(?:304\\d|404)\\d', example_number='4040', possible_length=(4, 5)), sms_services=PhoneNumberDesc(national_number_pattern='(?:304\\d|404)\\d', example_number='4040', possible_length=(4, 5)), short_data=True) diff --git a/python/phonenumbers/tzdata/data0.py b/python/phonenumbers/tzdata/data0.py index 83897f919..5114fb2dc 100644 --- a/python/phonenumbers/tzdata/data0.py +++ b/python/phonenumbers/tzdata/data0.py @@ -3244,7 +3244,7 @@ '79':('Europe/Moscow',), '81':('Asia/Tokyo',), '82':('Asia/Seoul',), - '84':('Asia/Bangkok',), + '84':('Asia/Ho_Chi_Minh',), '850':('Asia/Seoul',), '852':('Asia/Hong_Kong',), '853':('Asia/Shanghai',),