From 7b546506e0b04c5a149b4abe3977f6b936bfc30e Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Thu, 7 Sep 2023 06:24:03 +0100 Subject: [PATCH] Generated files for metadata --- python/phonenumbers/carrierdata/data0.py | 6 ++--- python/phonenumbers/carrierdata/data1.py | 8 +++---- python/phonenumbers/carrierdata/data2.py | 29 ++++++++++++++---------- python/phonenumbers/data/region_AR.py | 4 ++-- python/phonenumbers/data/region_BD.py | 2 +- python/phonenumbers/data/region_GY.py | 6 ++--- python/phonenumbers/data/region_IL.py | 2 +- python/phonenumbers/data/region_NZ.py | 15 ++++++------ python/phonenumbers/data/region_OM.py | 2 +- python/phonenumbers/data/region_RW.py | 6 ++--- python/phonenumbers/data/region_TN.py | 2 +- 11 files changed, 43 insertions(+), 39 deletions(-) diff --git a/python/phonenumbers/carrierdata/data0.py b/python/phonenumbers/carrierdata/data0.py index c4882c0b2..09682bde3 100644 --- a/python/phonenumbers/carrierdata/data0.py +++ b/python/phonenumbers/carrierdata/data0.py @@ -793,6 +793,7 @@ '2164':{'en': 'Tunisie Telecom'}, '21645':{'en': 'Watany Ettisalat'}, '21646':{'en': 'Ooredoo'}, + '21648':{'en': 'Ooredoo'}, '2165':{'en': 'Orange'}, '2169':{'en': 'Tunisie Telecom'}, '21891':{'en': 'Al-Madar'}, @@ -1223,6 +1224,7 @@ '24999':{'en': 'MTN'}, '25072':{'en': 'TIGO'}, '25073':{'en': 'Airtel'}, + '25077':{'en': 'KtRN'}, '25078':{'en': 'MTN'}, '25079':{'en': 'MTN'}, '2517':{'en': 'Safaricom'}, @@ -5500,6 +5502,7 @@ '46701347':{'en': 'EU Tel AB'}, '46701348':{'en': 'EU Tel AB'}, '46701349':{'en': 'EU Tel AB'}, + '46701350':{'en': '42 Telecom AB'}, '46701353':{'en': 'EU Tel AB'}, '46701356':{'en': 'EU Tel AB'}, '46701358':{'en': 'EU Tel AB'}, @@ -10016,7 +10019,4 @@ '553199635':{'en': 'Telemig Celular'}, '553199636':{'en': 'Telemig Celular'}, '553199637':{'en': 'Telemig Celular'}, - '553199638':{'en': 'Telemig Celular'}, - '553199639':{'en': 'Telemig Celular'}, - '553199641':{'en': 'Telemig Celular'}, } diff --git a/python/phonenumbers/carrierdata/data1.py b/python/phonenumbers/carrierdata/data1.py index 865b7c3d5..d4bc33c3a 100644 --- a/python/phonenumbers/carrierdata/data1.py +++ b/python/phonenumbers/carrierdata/data1.py @@ -19,6 +19,9 @@ # limitations under the License. data = { + '553199638':{'en': 'Telemig Celular'}, + '553199639':{'en': 'Telemig Celular'}, + '553199641':{'en': 'Telemig Celular'}, '553199642':{'en': 'Telemig Celular'}, '553199643':{'en': 'Telemig Celular'}, '553199644':{'en': 'Telemig Celular'}, @@ -9566,6 +9569,7 @@ '569379':{'en': 'Ops Ingenieria Ltda.'}, '569380':{'en': 'Ops Ingenieria Ltda.'}, '569381':{'en': 'Ops Ingenieria Ltda.'}, + '569388':{'en': 'Entel'}, '56940':{'en': 'Entel'}, '56941':{'en': 'Movistar'}, '56942':{'en': 'Entel'}, @@ -10015,8 +10019,4 @@ '573014':{'en': 'Tigo'}, '573015':{'en': 'Tigo'}, '573016':{'en': 'Tigo'}, - '573017':{'en': 'Tigo'}, - '573022':{'en': 'Tigo'}, - '573023':{'en': 'Tigo'}, - '573024':{'en': 'Tigo'}, } diff --git a/python/phonenumbers/carrierdata/data2.py b/python/phonenumbers/carrierdata/data2.py index f784ea475..1448aa74b 100644 --- a/python/phonenumbers/carrierdata/data2.py +++ b/python/phonenumbers/carrierdata/data2.py @@ -19,6 +19,10 @@ # limitations under the License. data = { + '573017':{'en': 'Tigo'}, + '573022':{'en': 'Tigo'}, + '573023':{'en': 'Tigo'}, + '573024':{'en': 'Tigo'}, '5730247':{'en': 'Partners Telecom Colombia'}, '5730248':{'en': 'Partners Telecom Colombia'}, '5730249':{'en': 'Partners Telecom Colombia'}, @@ -369,32 +373,33 @@ '59176':{'en': 'Tigo'}, '59177':{'en': 'Tigo'}, '59179':{'en': 'Nuevatel'}, + '5925':{'en': 'GTT'}, '592600':{'en': 'Digicel Guyana'}, '592601':{'en': 'Digicel Guyana'}, '592602':{'en': 'Digicel Guyana'}, '592603':{'en': 'Digicel Guyana'}, '592604':{'en': 'Digicel Guyana'}, '592608':{'en': 'Digicel Guyana'}, - '592609':{'en': 'Guyana Telephone and Telegraph Company'}, - '59261':{'en': 'Guyana Telephone and Telegraph Company'}, - '59262':{'en': 'Guyana Telephone and Telegraph Company'}, + '592609':{'en': 'GTT'}, + '59261':{'en': 'GTT'}, + '59262':{'en': 'GTT'}, '592630':{'en': 'Digicel Guyana'}, + '592631':{'en': 'GTT'}, '592632':{'en': 'Digicel Guyana'}, '592636':{'en': 'Digicel Guyana'}, '592637':{'en': 'Digicel Guyana'}, - '592638':{'en': 'Guyana Telephone and Telegraph Company'}, - '592639':{'en': 'Guyana Telephone and Telegraph Company'}, - '59264':{'en': 'Guyana Telephone and Telegraph Company'}, - '59265':{'en': 'Guyana Telephone and Telegraph Company'}, - '592659':{'en': 'Digicel Guyana'}, + '592638':{'en': 'GTT'}, + '592639':{'en': 'GTT'}, + '59264':{'en': 'GTT'}, + '59265':{'en': 'GTT'}, '59266':{'en': 'Digicel Guyana'}, '59267':{'en': 'Digicel Guyana'}, '59268':{'en': 'Digicel Guyana'}, '59269':{'en': 'Digicel Guyana'}, - '592700':{'en': 'Digicel Guyana'}, - '592701':{'en': 'Digicel Guyana'}, - '592702':{'en': 'Digicel Guyana'}, - '592703':{'en': 'Digicel Guyana'}, + '59270':{'en': 'GTT'}, + '59271':{'en': 'GTT'}, + '59272':{'en': 'GTT'}, + '59274':{'en': 'GTT'}, '59393':{'en': 'Claro'}, '5939586':{'en': 'Movistar'}, '5939587':{'en': 'Movistar'}, diff --git a/python/phonenumbers/data/region_AR.py b/python/phonenumbers/data/region_AR.py index 7757116d5..25025d899 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-7]|[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-7]|[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}|(?: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)), 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_BD.py b/python/phonenumbers/data/region_BD.py index 6294d5b8e..196147d9e 100644 --- a/python/phonenumbers/data/region_BD.py +++ b/python/phonenumbers/data/region_BD.py @@ -6,7 +6,7 @@ fixed_line=PhoneNumberDesc(national_number_pattern='(?:4(?:31\\d\\d|423)|5222)\\d{3}(?:\\d{2})?|8332[6-9]\\d\\d|(?:3(?:03[56]|224)|4(?:22[25]|653))\\d{3,4}|(?:3(?:42[47]|529|823)|4(?:027|525|65(?:28|8))|562|6257|7(?:1(?:5[3-5]|6[12]|7[156]|89)|22[589]56|32|42675|52(?:[25689](?:56|8)|[347]8)|71(?:6[1267]|75|89)|92374)|82(?:2[59]|32)56|9(?:03[23]56|23(?:256|373)|31|5(?:1|2[4589]56)))\\d{3}|(?:3(?:02[348]|22[35]|324|422)|4(?:22[67]|32[236-9]|6(?:2[46]|5[57])|953)|5526|6(?:024|6655)|81)\\d{4,5}|(?:2(?:7(?:1[0-267]|2[0-289]|3[0-29]|4[01]|5[1-3]|6[013]|7[0178]|91)|8(?:0[125]|1[1-6]|2[0157-9]|3[1-69]|41|6[1-35]|7[1-5]|8[1-8]|9[0-6])|9(?:0[0-2]|1[0-4]|2[568]|3[3-6]|5[5-7]|6[0136-9]|7[0-7]|8[014-9]))|3(?:0(?:2[025-79]|3[2-4])|181|22[12]|32[2356]|824)|4(?:02[09]|22[348]|32[045]|523|6(?:27|54))|666(?:22|53)|7(?:22[57-9]|42[56]|82[35])8|8(?:0[124-9]|2(?:181|2[02-4679]8)|4[12]|[5-7]2)|9(?:[04]2|2(?:2|328)|81))\\d{4}|(?:2(?:222|[45]\\d)\\d|3(?:1(?:2[5-7]|[5-7])|425|822)|4(?:033|1\\d|[257]1|332|4(?:2[246]|5[25])|6(?:2[35]|56|62)|8(?:23|54)|92[2-5])|5(?:02[03489]|22[457]|32[35-79]|42[46]|6(?:[18]|53)|724|826)|6(?:023|2(?:2[2-5]|5[3-5]|8)|32[3478]|42[34]|52[47]|6(?:[18]|6(?:2[34]|5[24]))|[78]2[2-5]|92[2-6])|7(?:02|21\\d|[3-589]1|6[12]|72[24])|8(?:217|3[12]|[5-7]1)|9[24]1)\\d{5}|(?:(?:3[2-8]|5[2-57-9]|6[03-589])1|4[4689][18])\\d{5}|[59]1\\d{5}', example_number='27111234', possible_length=(6, 7, 8, 9, 10)), mobile=PhoneNumberDesc(national_number_pattern='(?:1[13-9]\\d|644)\\d{7}|(?:3[78]|44|66)[02-9]\\d{7}', example_number='1812345678', possible_length=(10,)), toll_free=PhoneNumberDesc(national_number_pattern='80[03]\\d{7}', example_number='8001234567', possible_length=(10,)), - voip=PhoneNumberDesc(national_number_pattern='96(?:0[469]|1[0-47]|3[389]|6[69]|7[78])\\d{6}', example_number='9604123456', possible_length=(10,)), + voip=PhoneNumberDesc(national_number_pattern='96(?:0[469]|1[0-47]|3[389]|43|6[69]|7[78])\\d{6}', example_number='9604123456', possible_length=(10,)), national_prefix='0', national_prefix_for_parsing='0', number_format=[NumberFormat(pattern='(\\d{2})(\\d{4,6})', format='\\1-\\2', leading_digits_pattern=['31[5-8]|[459]1'], national_prefix_formatting_rule='0\\1'), diff --git a/python/phonenumbers/data/region_GY.py b/python/phonenumbers/data/region_GY.py index 535a258f5..0f0f55428 100644 --- a/python/phonenumbers/data/region_GY.py +++ b/python/phonenumbers/data/region_GY.py @@ -2,9 +2,9 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata PHONE_METADATA_GY = PhoneMetadata(id='GY', country_code=592, international_prefix='001', - general_desc=PhoneNumberDesc(national_number_pattern='9008\\d{3}|(?:[2-467]\\d\\d|862)\\d{4}', possible_length=(7,)), + general_desc=PhoneNumberDesc(national_number_pattern='9008\\d{3}|(?:[2-467]\\d\\d|510|862)\\d{4}', possible_length=(7,)), fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:1[6-9]|2[0-35-9]|3[1-4]|5[3-9]|6\\d|7[0-24-79])|3(?:2[25-9]|3\\d)|4(?:4[0-24]|5[56])|77[1-57])\\d{4}', example_number='2201234', possible_length=(7,)), - mobile=PhoneNumberDesc(national_number_pattern='(?:6\\d\\d|70[0-35-7])\\d{4}', example_number='6091234', possible_length=(7,)), + mobile=PhoneNumberDesc(national_number_pattern='(?:510|6\\d\\d|7(?:0\\d|1[0-8]|25|49))\\d{4}', example_number='6091234', possible_length=(7,)), toll_free=PhoneNumberDesc(national_number_pattern='(?:289|862)\\d{4}', example_number='2891234', possible_length=(7,)), premium_rate=PhoneNumberDesc(national_number_pattern='9008\\d{3}', example_number='9008123', possible_length=(7,)), - number_format=[NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[2-46-9]'])]) + number_format=[NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[2-9]'])]) diff --git a/python/phonenumbers/data/region_IL.py b/python/phonenumbers/data/region_IL.py index 374b26ef3..15ba686f4 100644 --- a/python/phonenumbers/data/region_IL.py +++ b/python/phonenumbers/data/region_IL.py @@ -4,7 +4,7 @@ PHONE_METADATA_IL = PhoneMetadata(id='IL', country_code=972, international_prefix='0(?:0|1[2-9])', general_desc=PhoneNumberDesc(national_number_pattern='1\\d{6}(?:\\d{3,5})?|[57]\\d{8}|[1-489]\\d{7}', possible_length=(7, 8, 9, 10, 11, 12)), fixed_line=PhoneNumberDesc(national_number_pattern='153\\d{8,9}|29[1-9]\\d{5}|(?:2[0-8]|[3489]\\d)\\d{6}', example_number='21234567', possible_length=(8, 11, 12), possible_length_local_only=(7,)), - mobile=PhoneNumberDesc(national_number_pattern='55410\\d{4}|5(?:(?:[0-249][2-9]|[36]\\d|8[3-7])\\d|5(?:01|2[2-9]|3[0-3]|4[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}', example_number='502345678', possible_length=(9,)), + mobile=PhoneNumberDesc(national_number_pattern='55410\\d{4}|5(?:(?:[02][02-9]|[149][2-9]|[36]\\d|8[3-7])\\d|5(?:01|2[2-9]|3[0-3]|4[34]|5[0-25689]|6[6-8]|7[0-267]|8[7-9]|9[1-9]))\\d{5}', example_number='502345678', possible_length=(9,)), toll_free=PhoneNumberDesc(national_number_pattern='1(?:255|80[019]\\d{3})\\d{3}', example_number='1800123456', possible_length=(7, 10)), premium_rate=PhoneNumberDesc(national_number_pattern='1212\\d{4}|1(?:200|9(?:0[0-2]|19))\\d{6}', example_number='1919123456', possible_length=(8, 10)), shared_cost=PhoneNumberDesc(national_number_pattern='1700\\d{6}', example_number='1700123456', possible_length=(10,)), diff --git a/python/phonenumbers/data/region_NZ.py b/python/phonenumbers/data/region_NZ.py index d56ff12cf..cebe606b7 100644 --- a/python/phonenumbers/data/region_NZ.py +++ b/python/phonenumbers/data/region_NZ.py @@ -2,21 +2,20 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata PHONE_METADATA_NZ = PhoneMetadata(id='NZ', country_code=64, international_prefix='0(?:0|161)', - general_desc=PhoneNumberDesc(national_number_pattern='[29]\\d{7,9}|50\\d{5}(?:\\d{2,3})?|6[0-35-9]\\d{6}|7\\d{7,8}|8\\d{4,9}|(?:11\\d|[34])\\d{7}', possible_length=(5, 6, 7, 8, 9, 10)), + general_desc=PhoneNumberDesc(national_number_pattern='[1289]\\d{9}|50\\d{5}(?:\\d{2,3})?|[27-9]\\d{7,8}|(?:[34]\\d|6[0-35-9])\\d{6}|8\\d{4,6}', possible_length=(5, 6, 7, 8, 9, 10)), fixed_line=PhoneNumberDesc(national_number_pattern='24099\\d{3}|(?:3[2-79]|[49][2-9]|6[235-9]|7[2-57-9])\\d{6}', example_number='32345678', possible_length=(8,), possible_length_local_only=(7,)), mobile=PhoneNumberDesc(national_number_pattern='2(?:[0-27-9]\\d|6)\\d{6,7}|2(?:1\\d|75)\\d{5}', example_number='211234567', possible_length=(8, 9, 10)), toll_free=PhoneNumberDesc(national_number_pattern='508\\d{6,7}|80\\d{6,8}', example_number='800123456', possible_length=(8, 9, 10)), - premium_rate=PhoneNumberDesc(national_number_pattern='(?:11\\d{5}|50(?:0[08]|30|66|77|88))\\d{3}|90\\d{6,8}', example_number='900123456', possible_length=(7, 8, 9, 10)), + premium_rate=PhoneNumberDesc(national_number_pattern='(?:1[13-57-9]\\d{5}|50(?:0[08]|30|66|77|88))\\d{3}|90\\d{6,8}', example_number='900123456', possible_length=(7, 8, 9, 10)), personal_number=PhoneNumberDesc(national_number_pattern='70\\d{7}', example_number='701234567', possible_length=(9,)), - pager=PhoneNumberDesc(national_number_pattern='86\\d{6,7}', example_number='86123456', possible_length=(8, 9)), - uan=PhoneNumberDesc(national_number_pattern='8(?:1[6-9]|22|3\\d|4[045]|5[459]|7[0-3579]|90)\\d{2,7}', example_number='83012378', possible_length=(5, 6, 7, 8, 9, 10)), + uan=PhoneNumberDesc(national_number_pattern='8(?:1[16-9]|22|3\\d|4[045]|5[459]|6[235-9]|7[0-3579]|90)\\d{2,7}', example_number='83012378', possible_length=(5, 6, 7, 8, 9, 10)), preferred_international_prefix='00', national_prefix='0', national_prefix_for_parsing='0', - number_format=[NumberFormat(pattern='(\\d{2})(\\d{3,8})', format='\\1 \\2', leading_digits_pattern=['8[1-579]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3', leading_digits_pattern=['50[036-8]|[89]0', '50(?:[0367]|88)|[89]0'], national_prefix_formatting_rule='0\\1'), + number_format=[NumberFormat(pattern='(\\d{2})(\\d{3,8})', format='\\1 \\2', leading_digits_pattern=['8[1-79]'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3', leading_digits_pattern=['50[036-8]|8|90', '50(?:[0367]|88)|8|90'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d)(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['24|[346]|7[2-57-9]|9[2-9]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['2(?:10|74)|[59]|80'], national_prefix_formatting_rule='0\\1'), + NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['2(?:10|74)|[589]'], national_prefix_formatting_rule='0\\1'), NumberFormat(pattern='(\\d{2})(\\d{3,4})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['1|2[028]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,5})', format='\\1 \\2 \\3', leading_digits_pattern=['2(?:[169]|7[0-35-9])|7|86'], national_prefix_formatting_rule='0\\1')], + NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,5})', format='\\1 \\2 \\3', leading_digits_pattern=['2(?:[169]|7[0-35-9])|7'], national_prefix_formatting_rule='0\\1')], mobile_number_portable_region=True) diff --git a/python/phonenumbers/data/region_OM.py b/python/phonenumbers/data/region_OM.py index e66a1c858..fc51336c2 100644 --- a/python/phonenumbers/data/region_OM.py +++ b/python/phonenumbers/data/region_OM.py @@ -4,7 +4,7 @@ PHONE_METADATA_OM = PhoneMetadata(id='OM', country_code=968, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='(?:1505|[279]\\d{3}|500)\\d{4}|800\\d{5,6}', possible_length=(7, 8, 9)), fixed_line=PhoneNumberDesc(national_number_pattern='2[1-6]\\d{6}', example_number='23123456', possible_length=(8,)), - mobile=PhoneNumberDesc(national_number_pattern='1505\\d{4}|(?:7(?:[1289]\\d|69|7[0-5])|9(?:0[1-9]|[1-9]\\d))\\d{5}', example_number='92123456', possible_length=(8,)), + mobile=PhoneNumberDesc(national_number_pattern='1505\\d{4}|(?:7(?:[1289]\\d|6[89]|7[0-5])|9(?:0[1-9]|[1-9]\\d))\\d{5}', example_number='92123456', possible_length=(8,)), toll_free=PhoneNumberDesc(national_number_pattern='8007\\d{4,5}|(?:500|800[05])\\d{4}', example_number='80071234', possible_length=(7, 8, 9)), premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{5}', example_number='90012345', possible_length=(8,)), number_format=[NumberFormat(pattern='(\\d{3})(\\d{4,6})', format='\\1 \\2', leading_digits_pattern=['[58]']), diff --git a/python/phonenumbers/data/region_RW.py b/python/phonenumbers/data/region_RW.py index feaeec6aa..cc39d0d0e 100644 --- a/python/phonenumbers/data/region_RW.py +++ b/python/phonenumbers/data/region_RW.py @@ -4,11 +4,11 @@ PHONE_METADATA_RW = PhoneMetadata(id='RW', country_code=250, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='(?:06|[27]\\d\\d|[89]00)\\d{6}', possible_length=(8, 9)), fixed_line=PhoneNumberDesc(national_number_pattern='(?:06|2[23568]\\d)\\d{6}', example_number='250123456', possible_length=(8, 9)), - mobile=PhoneNumberDesc(national_number_pattern='7[2389]\\d{7}', example_number='720123456', possible_length=(9,)), + mobile=PhoneNumberDesc(national_number_pattern='7[237-9]\\d{7}', example_number='720123456', possible_length=(9,)), toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6}', example_number='800123456', possible_length=(9,)), premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{6}', example_number='900123456', possible_length=(9,)), national_prefix='0', national_prefix_for_parsing='0', number_format=[NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['0']), - NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[7-9]'], national_prefix_formatting_rule='0\\1'), - NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['2'])]) + NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['2']), + NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[7-9]'], national_prefix_formatting_rule='0\\1')]) diff --git a/python/phonenumbers/data/region_TN.py b/python/phonenumbers/data/region_TN.py index d353f5bd8..ab4efe060 100644 --- a/python/phonenumbers/data/region_TN.py +++ b/python/phonenumbers/data/region_TN.py @@ -4,7 +4,7 @@ PHONE_METADATA_TN = PhoneMetadata(id='TN', country_code=216, international_prefix='00', general_desc=PhoneNumberDesc(national_number_pattern='[2-57-9]\\d{7}', possible_length=(8,)), fixed_line=PhoneNumberDesc(national_number_pattern='81200\\d{3}|(?:3[0-2]|7\\d)\\d{6}', example_number='30010123', possible_length=(8,)), - mobile=PhoneNumberDesc(national_number_pattern='3(?:001|[12]40)\\d{4}|(?:(?:[259]\\d|4[0-7])\\d|3(?:1[1-35]|6[0-4]|91))\\d{5}', example_number='20123456', possible_length=(8,)), + mobile=PhoneNumberDesc(national_number_pattern='3(?:001|[12]40)\\d{4}|(?:(?:[259]\\d|4[0-8])\\d|3(?:1[1-35]|6[0-4]|91))\\d{5}', example_number='20123456', possible_length=(8,)), toll_free=PhoneNumberDesc(national_number_pattern='8010\\d{4}', example_number='80101234', possible_length=(8,)), premium_rate=PhoneNumberDesc(national_number_pattern='88\\d{6}', example_number='88123456', possible_length=(8,)), shared_cost=PhoneNumberDesc(national_number_pattern='8[12]10\\d{4}', example_number='81101234', possible_length=(8,)),