diff --git a/python/phonenumbers/carrierdata/data0.py b/python/phonenumbers/carrierdata/data0.py index 349d8b30..62972d59 100644 --- a/python/phonenumbers/carrierdata/data0.py +++ b/python/phonenumbers/carrierdata/data0.py @@ -6434,28 +6434,17 @@ '474629':{'en': 'erate'}, '47463':{'en': 'telia'}, '47464':{'en': 'NetCom'}, - '474650':{'en': 'telia'}, + '47465':{'en': 'telia'}, '474651':{'en': 'ice norge'}, '474652':{'en': 'ice norge'}, '474653':{'en': 'ice norge'}, - '474654':{'en': 'telia'}, - '474655':{'en': 'telia'}, - '474656':{'en': 'telia'}, - '474657':{'en': 'telia'}, - '474658':{'en': 'telia'}, - '474659':{'en': 'telia'}, '47466':{'en': 'telia'}, '474666':{'en': 'telenor norge'}, '474667':{'en': 'telenor norge'}, - '474670':{'en': 'telia'}, + '47467':{'en': 'telia'}, '474671':{'en': 'lyca mobile'}, '474672':{'en': 'lyca mobile'}, - '474674':{'en': 'telia'}, - '474675':{'en': 'telia'}, - '474676':{'en': 'telia'}, - '474677':{'en': 'telia'}, - '474678':{'en': 'telia'}, - '474679':{'en': 'telia'}, + '474673':{'en': 'Ixt AS'}, '47468':{'en': 'telenor norge'}, '474690':{'en': 'telenor norge'}, '474691':{'en': 'telenor norge'}, @@ -6699,6 +6688,9 @@ '479698':{'en': 'lyca mobile'}, '479699':{'en': 'lyca mobile'}, '4797':{'en': 'telenor norge'}, + '479727':{'en': 'ice norge'}, + '479728':{'en': 'ice norge'}, + '479729':{'en': 'ice norge'}, '479730':{'en': 'ice norge'}, '479731':{'en': 'ice norge'}, '479732':{'en': 'ice norge'}, @@ -10019,4 +10011,12 @@ '552899986':{'en': 'Vivo'}, '552899987':{'en': 'Vivo'}, '552899988':{'en': 'Vivo'}, + '552899989':{'en': 'Vivo'}, + '552899991':{'en': 'Vivo'}, + '552899992':{'en': 'Vivo'}, + '552899993':{'en': 'Vivo'}, + '552899994':{'en': 'Vivo'}, + '552899995':{'en': 'Vivo'}, + '552899996':{'en': 'Vivo'}, + '552899997':{'en': 'Vivo'}, } diff --git a/python/phonenumbers/carrierdata/data1.py b/python/phonenumbers/carrierdata/data1.py index 0250e104..e45bf741 100644 --- a/python/phonenumbers/carrierdata/data1.py +++ b/python/phonenumbers/carrierdata/data1.py @@ -19,14 +19,6 @@ # limitations under the License. data = { - '552899989':{'en': 'Vivo'}, - '552899991':{'en': 'Vivo'}, - '552899992':{'en': 'Vivo'}, - '552899993':{'en': 'Vivo'}, - '552899994':{'en': 'Vivo'}, - '552899995':{'en': 'Vivo'}, - '552899996':{'en': 'Vivo'}, - '552899997':{'en': 'Vivo'}, '552899998':{'en': 'Vivo'}, '55319820':{'en': 'Claro'}, '55319821':{'en': 'Claro'}, @@ -10019,4 +10011,12 @@ '569929':{'en': 'Entel'}, '569930':{'en': 'Entel'}, '569931':{'en': 'Entel'}, + '569932':{'en': 'Movistar'}, + '569933':{'en': 'Movistar'}, + '569934':{'en': 'Movistar'}, + '569935':{'en': 'Entel'}, + '569936':{'en': 'Movistar'}, + '569937':{'en': 'Movistar'}, + '5699380':{'en': 'Movistar'}, + '5699381':{'en': 'Movistar'}, } diff --git a/python/phonenumbers/carrierdata/data2.py b/python/phonenumbers/carrierdata/data2.py index 68314678..11217eae 100644 --- a/python/phonenumbers/carrierdata/data2.py +++ b/python/phonenumbers/carrierdata/data2.py @@ -19,14 +19,6 @@ # limitations under the License. data = { - '569932':{'en': 'Movistar'}, - '569933':{'en': 'Movistar'}, - '569934':{'en': 'Movistar'}, - '569935':{'en': 'Entel'}, - '569936':{'en': 'Movistar'}, - '569937':{'en': 'Movistar'}, - '5699380':{'en': 'Movistar'}, - '5699381':{'en': 'Movistar'}, '5699382':{'en': 'Entel'}, '5699383':{'en': 'Entel'}, '5699385':{'en': 'Claro'}, diff --git a/python/phonenumbers/data/region_DE.py b/python/phonenumbers/data/region_DE.py index 9f3d0bc6..c0746186 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='15310\\d{6}|1(?:6[023]|7[0-57-9])\\d{7,8}|1(?:5[0-25-9]|76)\\d{8}', example_number='15123456789', possible_length=(10, 11)), + mobile=PhoneNumberDesc(national_number_pattern='16[023]\\d{7,8}|1(?:5310|7[0-57-9]\\d)\\d{6}|1(?:5[0-25-9]|76)\\d{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)), diff --git a/python/phonenumbers/data/region_SG.py b/python/phonenumbers/data/region_SG.py index 12bffc9d..254b6365 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(?:0(?:[1-8]\\d|9[0-689])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-3]|62))|9[0-8]\\d\\d)\\d{4}', example_number='81234567', possible_length=(8,)), + mobile=PhoneNumberDesc(national_number_pattern='(?:8(?:0(?:[1-8]\\d|9[0-689])|[1-8]\\d\\d|9(?:[0-4]\\d|5[0-3]|6[0-2]))|9[0-8]\\d\\d)\\d{4}', 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_UG.py b/python/phonenumbers/data/region_UG.py index d4fdf0fb..c2d7d7bc 100644 --- a/python/phonenumbers/data/region_UG.py +++ b/python/phonenumbers/data/region_UG.py @@ -4,7 +4,7 @@ PHONE_METADATA_UG = PhoneMetadata(id='UG', country_code=256, international_prefix='00[057]', general_desc=PhoneNumberDesc(national_number_pattern='800\\d{6}|(?:[29]0|[347]\\d)\\d{7}', possible_length=(9,), possible_length_local_only=(5, 6, 7)), fixed_line=PhoneNumberDesc(national_number_pattern='20(?:(?:240|30[67])\\d|6(?:00[0-2]|30[0-4]))\\d{3}|(?:20(?:[017]\\d|2[5-9]|3[1-4]|5[0-4]|6[15-9])|[34]\\d{3})\\d{5}', example_number='312345678', possible_length=(9,), possible_length_local_only=(5, 6, 7)), - mobile=PhoneNumberDesc(national_number_pattern='72[48]0\\d{5}|7(?:[015-8]\\d|2[067]|36|4[0-5]|9[89])\\d{6}', example_number='712345678', possible_length=(9,)), + mobile=PhoneNumberDesc(national_number_pattern='72[48]0\\d{5}|7(?:[015-8]\\d|2[067]|36|4[0-6]|9[89])\\d{6}', example_number='712345678', possible_length=(9,)), toll_free=PhoneNumberDesc(national_number_pattern='800[1-3]\\d{5}', example_number='800123456', possible_length=(9,)), premium_rate=PhoneNumberDesc(national_number_pattern='90[1-3]\\d{6}', example_number='901123456', possible_length=(9,)), national_prefix='0', diff --git a/python/phonenumbers/data/region_WF.py b/python/phonenumbers/data/region_WF.py index 461d0663..807b7112 100644 --- a/python/phonenumbers/data/region_WF.py +++ b/python/phonenumbers/data/region_WF.py @@ -2,10 +2,11 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata PHONE_METADATA_WF = PhoneMetadata(id='WF', country_code=681, international_prefix='00', - general_desc=PhoneNumberDesc(national_number_pattern='(?:40|72)\\d{4}|8\\d{5}(?:\\d{3})?', possible_length=(6, 9)), + general_desc=PhoneNumberDesc(national_number_pattern='(?:40|72|8\\d{4})\\d{4}|[89]\\d{5}', possible_length=(6, 9)), fixed_line=PhoneNumberDesc(national_number_pattern='72\\d{4}', example_number='721234', possible_length=(6,)), mobile=PhoneNumberDesc(national_number_pattern='(?:72|8[23])\\d{4}', example_number='821234', possible_length=(6,)), toll_free=PhoneNumberDesc(national_number_pattern='80[0-5]\\d{6}', example_number='800012345', possible_length=(9,)), + voip=PhoneNumberDesc(national_number_pattern='9[23]\\d{4}', example_number='921234', possible_length=(6,)), voicemail=PhoneNumberDesc(national_number_pattern='[48]0\\d{4}', example_number='401234', possible_length=(6,)), - number_format=[NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3', leading_digits_pattern=['[478]']), + number_format=[NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3', leading_digits_pattern=['[47-9]']), NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['8'])])