phonenumbers 9.0.2__py2.py3-none-any.whl → 9.0.4__py2.py3-none-any.whl

phonenumbers/__init__.py

@@ -146,7 +146,7 @@ from .phonenumbermatcher import PhoneNumberMatch, PhoneNumberMatcher, Leniency
 
 # Version number is taken from the upstream libphonenumber version
 # together with an indication of the version of the Python-specific code.
-__version__ = "9.0.2"
+__version__ = "9.0.4"
 
 __all__ = ['PhoneNumber', 'CountryCodeSource', 'FrozenPhoneNumber',
            'REGION_CODE_FOR_NON_GEO_ENTITY', 'NumberFormat', 'PhoneNumberDesc', 'PhoneMetadata',

phonenumbers/carrierdata/data0.py

@@ -960,7 +960,7 @@ data = {
  '22897':{'en': 'TOGOCEL'},
  '22898':{'en': 'Moov'},
  '22899':{'en': 'Moov'},
- '229014':{'en': 'SBIN'},
+ '229014':{'en': 'Celtiis'},
  '2290142':{'en': 'MTN'},
  '2290145':{'en': 'Moov'},
  '2290146':{'en': 'MTN'},
@@ -979,6 +979,7 @@ data = {
  '2290169':{'en': 'MTN'},
  '2290190':{'en': 'MTN'},
  '2290191':{'en': 'MTN'},
+ '2290192':{'en': 'Celtiis'},
  '2290194':{'en': 'Moov'},
  '2290195':{'en': 'Moov'},
  '2290196':{'en': 'MTN'},
@@ -1053,6 +1054,8 @@ data = {
  '230702':{'en': 'MTML'},
  '230703':{'en': 'Emtel'},
  '230704':{'en': 'Emtel'},
+ '230705':{'en': 'Cellplus'},
+ '230706':{'en': 'Cellplus'},
  '230730':{'en': 'Emtel'},
  '230731':{'en': 'MTML'},
  '230733':{'en': 'Cellplus'},
@@ -1463,6 +1466,7 @@ data = {
  '26269306':{'en': 'Orange'},
  '26269310':{'en': 'SFR'},
  '26269311':{'en': 'Orange'},
+ '26269312':{'en': 'ZEOP Mobile'},
  '26269313':{'en': 'SFR'},
  '26269320':{'en': 'SFR'},
  '26269321':{'en': 'Orange'},
@@ -2168,6 +2172,7 @@ data = {
  '3375430':{'en': 'TDF'},
  '3375431':{'en': 'Legos'},
  '3375432':{'en': 'Euroinformation Telecom'},
+ '3375433':{'en': 'SFR'},
  '337544':{'en': 'Lebara France Limited'},
  '337545':{'en': 'Lebara France Limited'},
  '337546':{'en': 'Mobiquithings'},
@@ -2235,6 +2240,7 @@ data = {
  '3375758':{'en': 'Euroinformation Telecom'},
  '3375759':{'en': 'Twilio Ireland Limited'},
  '3375760':{'en': 'Twilio Ireland Limited'},
+ '3375761':{'en': 'SFR'},
  '3375763':{'en': 'Euroinformation Telecom'},
  '3375764':{'en': 'Bouygues'},
  '3375765':{'en': 'Bouygues'},
@@ -2245,6 +2251,7 @@ data = {
  '3375773':{'en': 'SFR'},
  '3375774':{'en': 'SFR'},
  '3375777':{'en': 'Euroinformation Telecom'},
+ '3375778':{'en': 'SFR'},
  '3375779':{'en': 'Halys'},
  '3375786':{'en': 'Orange France'},
  '3375787':{'en': 'Euroinformation Telecom'},
@@ -3861,10 +3868,14 @@ data = {
  '42377':{'en': 'Swisscom'},
  '42378':{'en': 'Salt'},
  '42379':{'en': 'Telecom Liechtenstein'},
+ '436485':{'en': 'Three'},
  '43650':{'en': 'tele.ring'},
- '43660':{'en': 'Hutchison Drei Austria'},
+ '43660':{'en': 'Three'},
  '43664':{'en': 'A1 TA'},
+ '43665':{'en': 'Three'},
+ '43668':{'en': 'Three'},
  '43670':{'en': 'spusu'},
+ '43672':{'en': 'Three'},
  '43676':{'en': 'T-Mobile AT'},
  '436770':{'en': 'T-Mobile AT'},
  '436771':{'en': 'T-Mobile AT'},
@@ -3873,9 +3884,13 @@ data = {
  '436779':{'en': 'T-Mobile AT'},
  '4368181':{'en': 'A1 TA'},
  '4368182':{'en': 'A1 TA'},
- '4368183':{'en': 'Orange AT'},
+ '4368183':{'en': 'Three'},
  '4368184':{'en': 'A1 TA'},
+ '436819':{'en': 'Three'},
+ '43686':{'en': 'Three'},
  '43688':{'en': 'Orange AT'},
+ '43690':{'en': 'Three'},
+ '43696':{'en': 'Three'},
  '43699':{'en': 'Orange AT'},
  '447106':{'en': 'O2'},
  '447107':{'en': 'O2'},
@@ -10004,19 +10019,4 @@ data = {
  '55329846':{'en': 'Claro'},
  '55329847':{'en': 'Claro'},
  '553298480':{'en': 'Claro'},
- '553298481':{'en': 'Claro'},
- '553298482':{'en': 'Claro'},
- '553298483':{'en': 'Claro'},
- '553298484':{'en': 'Claro'},
- '553298485':{'en': 'Claro'},
- '5532985':{'en': 'Oi'},
- '5532986':{'en': 'Oi'},
- '5532987':{'en': 'Oi'},
- '5532988':{'en': 'Oi'},
- '5532989':{'en': 'Oi'},
- '553299101':{'en': 'TIM'},
- '553299102':{'en': 'TIM'},
- '553299103':{'en': 'TIM'},
- '553299104':{'en': 'TIM'},
- '553299105':{'en': 'TIM'},
 }

phonenumbers/carrierdata/data1.py

@@ -19,6 +19,21 @@ from ..util import u
 # limitations under the License.
 
 data = {
+ '553298481':{'en': 'Claro'},
+ '553298482':{'en': 'Claro'},
+ '553298483':{'en': 'Claro'},
+ '553298484':{'en': 'Claro'},
+ '553298485':{'en': 'Claro'},
+ '5532985':{'en': 'Oi'},
+ '5532986':{'en': 'Oi'},
+ '5532987':{'en': 'Oi'},
+ '5532988':{'en': 'Oi'},
+ '5532989':{'en': 'Oi'},
+ '553299101':{'en': 'TIM'},
+ '553299102':{'en': 'TIM'},
+ '553299103':{'en': 'TIM'},
+ '553299104':{'en': 'TIM'},
+ '553299105':{'en': 'TIM'},
  '553299106':{'en': 'TIM'},
  '553299107':{'en': 'TIM'},
  '553299108':{'en': 'TIM'},
@@ -10004,19 +10019,4 @@ data = {
  '573249':{'en': 'Partners Telecom Colombia'},
  '57330':{'en': 'Movistar'},
  '5733300':{'en': 'Setroc Mobile'},
- '5733301':{'en': 'Setroc Mobile'},
- '5733302':{'en': 'Setroc Mobile'},
- '5733303':{'en': 'Setroc Mobile'},
- '5733304':{'en': 'Setroc Mobile'},
- '5733305':{'en': 'Tigo'},
- '5733306':{'en': 'Tigo'},
- '5733307':{'en': 'Tigo'},
- '5733308':{'en': 'Tigo'},
- '5733310':{'en': 'Libre Tecnologias'},
- '5733311':{'en': 'Libre Tecnologias'},
- '5733312':{'en': 'Libre Tecnologias'},
- '5733313':{'en': 'Libre Tecnologias'},
- '5733314':{'en': 'Libre Tecnologias'},
- '5733315':{'en': 'Libre Tecnologias'},
- '5733316':{'en': 'Libre Tecnologias'},
 }

phonenumbers/carrierdata/data2.py

@@ -19,6 +19,21 @@ from ..util import u
 # limitations under the License.
 
 data = {
+ '5733301':{'en': 'Setroc Mobile'},
+ '5733302':{'en': 'Setroc Mobile'},
+ '5733303':{'en': 'Setroc Mobile'},
+ '5733304':{'en': 'Setroc Mobile'},
+ '5733305':{'en': 'Tigo'},
+ '5733306':{'en': 'Tigo'},
+ '5733307':{'en': 'Tigo'},
+ '5733308':{'en': 'Tigo'},
+ '5733310':{'en': 'Libre Tecnologias'},
+ '5733311':{'en': 'Libre Tecnologias'},
+ '5733312':{'en': 'Libre Tecnologias'},
+ '5733313':{'en': 'Libre Tecnologias'},
+ '5733314':{'en': 'Libre Tecnologias'},
+ '5733315':{'en': 'Libre Tecnologias'},
+ '5733316':{'en': 'Libre Tecnologias'},
  '57333170':{'en': 'Libre Tecnologias'},
  '57333171':{'en': 'Libre Tecnologias'},
  '573332':{'en': 'Movil Exito'},
@@ -1351,6 +1366,7 @@ data = {
  '658963':{'en': 'SingTel'},
  '658964':{'en': 'SingTel'},
  '658965':{'en': 'SingTel'},
+ '65897':{'en': 'Simba'},
  '659001':{'en': 'StarHub'},
  '659002':{'en': 'StarHub'},
  '659003':{'en': 'StarHub'},
@@ -3782,6 +3798,7 @@ data = {
  '8524699':{'en': 'South China Telecommunications', 'zh': u('\u4e2d\u570b\u5357\u65b9\u96fb\u4fe1(\u9999\u6e2f)\u6709\u9650\u516c\u53f8')},
  '852470':{'en': 'Hutchison Telecom', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
  '852471':{'en': 'Hutchison Telecom', 'zh': u('\u548c\u8a18\u96fb\u8a71\u6709\u9650\u516c\u53f8')},
+ '852472':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
  '8524740':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
  '8524741':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
  '8524742':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
@@ -3988,6 +4005,7 @@ data = {
  '852675':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf'), 'zh_Hant': u('\u9999\u6e2f\u79fb\u52d5\u901a\u8a0a')},
  '852676':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8'), 'zh_Hant': u('\u4e2d\u570b\u79fb\u52d5')},
  '852677':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf'), 'zh_Hant': u('\u9999\u6e2f\u79fb\u52d5\u901a\u8a0a')},
+ '852678':{'en': 'China Mobile', 'zh': u('\u4e2d\u56fd\u79fb\u52a8')},
  '852679':{'en': '3', 'zh': '3', 'zh_Hant': '3'},
  '852680':{'en': 'HKT', 'zh': u('\u9999\u6e2f\u79fb\u52a8\u901a\u8baf'), 'zh_Hant': u('\u9999\u6e2f\u79fb\u52d5\u901a\u8a0a')},
  '852681':{'en': 'China Unicom', 'zh': u('\u4e2d\u56fd\u8054\u901a'), 'zh_Hant': u('\u4e2d\u570b\u806f\u901a')},
@@ -8088,6 +8106,7 @@ data = {
  '961767':{'en': 'Touch'},
  '961768':{'en': 'Touch'},
  '961769':{'en': 'Touch'},
+ '961787':{'en': 'Touch'},
  '961788':{'en': 'Touch'},
  '961789':{'en': 'Touch'},
  '961791':{'en': 'Alfa'},
@@ -8105,20 +8124,13 @@ data = {
  '96277':{'en': 'Orange'},
  '96278':{'en': 'Umniah'},
  '96279':{'en': 'Zain JO'},
- '96350':{'en': 'Rcell'},
  '96391':{'en': 'Wafa Telecom'},
  '96392':{'en': 'Wafa Telecom'},
  '96393':{'en': 'Syriatel'},
  '96394':{'en': 'MTN'},
- '963950':{'en': 'MTN'},
- '963952':{'en': 'MTN'},
- '963954':{'en': 'MTN'},
- '963955':{'en': 'MTN'},
- '963956':{'en': 'MTN'},
- '963957':{'en': 'MTN'},
- '963958':{'en': 'MTN'},
- '963959':{'en': 'MTN'},
+ '96395':{'en': 'MTN'},
  '96396':{'en': 'MTN'},
+ '96397':{'en': 'MTN'},
  '96398':{'en': 'Syriatel'},
  '96399':{'en': 'Syriatel'},
  '96473':{'en': 'ITPC'},

phonenumbers/data/alt_format_43.py

@@ -1,4 +1,4 @@
 """Auto-generated file, do not edit by hand. 43 metadata"""
 from ..phonemetadata import NumberFormat
 
-PHONE_ALT_FORMAT_43 = [NumberFormat(pattern='(\\d)(\\d{3})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['1']), NumberFormat(pattern='(\\d)(\\d{4,6})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d)(\\d{7,8})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{6,7})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d)(\\d{9,12})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{4})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{2,4})', format='\\1 \\2 \\3 \\4 \\5', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{5})(\\d{4,6})', format='\\1 \\2 \\3', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]']), NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]']), NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]']), NumberFormat(pattern='(\\d{4})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['2|3(?:1[1-578]|[3-68])|4[2378]|5[2-6]|6(?:[124]|5[468])|7(?:2[1-8]|35|[4-79])'])]
+PHONE_ALT_FORMAT_43 = [NumberFormat(pattern='(\\d)(\\d{3})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['1']), NumberFormat(pattern='(\\d)(\\d{4,6})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d)(\\d{7,8})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{6,7})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d)(\\d{9,12})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{4})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2})(\\d{2,4})', format='\\1 \\2 \\3 \\4 \\5', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{2})(\\d{5})(\\d{4,6})', format='\\1 \\2 \\3', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['(?:31|4)6|51|6(?:485|5[0-3579]|[6-9])|7(?:20|32|8)|[89]']), NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['(?:31|4)6|51|6(?:485|5[0-3579]|[6-9])|7(?:20|32|8)|[89]']), NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['(?:31|4)6|51|6(?:485|5[0-3579]|[6-9])|7(?:20|32|8)|[89]']), NumberFormat(pattern='(\\d{4})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['2|3(?:1[1-578]|[3-68])|4[2378]|5[2-6]|6(?:[12]|4(?:[135-7]|8[34])|5[468])|7(?:2[1-8]|35|[4-79])'])]

phonenumbers/data/region_AT.py

@@ -3,8 +3,8 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_AT = PhoneMetadata(id='AT', country_code=43, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='1\\d{3,12}|2\\d{6,12}|43(?:(?:0\\d|5[02-9])\\d{3,9}|2\\d{4,5}|[3467]\\d{4}|8\\d{4,6}|9\\d{4,7})|5\\d{4,12}|8\\d{7,12}|9\\d{8,12}|(?:[367]\\d|4[0-24-9])\\d{4,11}', possible_length=(4, 5, 6, 7, 8, 9, 10, 11, 12, 13), possible_length_local_only=(3,)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='1(?:11\\d|[2-9]\\d{3,11})|(?:316|463|(?:51|66|73)2)\\d{3,10}|(?:2(?:1[467]|2[13-8]|5[2357]|6[1-46-8]|7[1-8]|8[124-7]|9[1458])|3(?:1[1-578]|3[23568]|4[5-7]|5[1378]|6[1-38]|8[3-68])|4(?:2[1-8]|35|7[1368]|8[2457])|5(?:2[1-8]|3[357]|4[147]|5[12578]|6[37])|6(?:13|2[1-47]|4[135-8]|5[468])|7(?:2[1-8]|35|4[13478]|5[68]|6[16-8]|7[1-6]|9[45]))\\d{4,10}', example_number='1234567890', possible_length=(4, 5, 6, 7, 8, 9, 10, 11, 12, 13), possible_length_local_only=(3,)),
-    mobile=PhoneNumberDesc(national_number_pattern='6(?:5[0-3579]|6[013-9]|[7-9]\\d)\\d{4,10}', example_number='664123456', possible_length=(7, 8, 9, 10, 11, 12, 13)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='1(?:11\\d|[2-9]\\d{3,11})|(?:316|463)\\d{3,10}|648[34]\\d{3,9}|(?:51|66|73)2\\d{3,10}|(?:2(?:1[467]|2[13-8]|5[2357]|6[1-46-8]|7[1-8]|8[124-7]|9[1458])|3(?:1[1-578]|3[23568]|4[5-7]|5[1378]|6[1-38]|8[3-68])|4(?:2[1-8]|35|7[1368]|8[2457])|5(?:2[1-8]|3[357]|4[147]|5[12578]|6[37])|6(?:13|2[1-47]|4[135-7]|5[468])|7(?:2[1-8]|35|4[13478]|5[68]|6[16-8]|7[1-6]|9[45]))\\d{4,10}', example_number='1234567890', possible_length=(4, 5, 6, 7, 8, 9, 10, 11, 12, 13), possible_length_local_only=(3,)),
+    mobile=PhoneNumberDesc(national_number_pattern='6(?:485|(?:5[0-3579]|6[013-9]|[7-9]\\d)\\d)\\d{3,9}', example_number='664123456', possible_length=(7, 8, 9, 10, 11, 12, 13)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6,10}', example_number='800123456', possible_length=(9, 10, 11, 12, 13)),
     premium_rate=PhoneNumberDesc(national_number_pattern='(?:8[69][2-68]|9(?:0[01]|3[019]))\\d{6,10}', example_number='900123456', possible_length=(9, 10, 11, 12, 13)),
     shared_cost=PhoneNumberDesc(national_number_pattern='8(?:10|2[018])\\d{6,10}|828\\d{5}', example_number='810123456', possible_length=(8, 9, 10, 11, 12, 13)),
@@ -16,14 +16,14 @@ PHONE_METADATA_AT = PhoneMetadata(id='AT', country_code=43, international_prefix
         NumberFormat(pattern='(\\d{3})(\\d{2})', format='\\1 \\2', leading_digits_pattern=['517'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{2})(\\d{3,5})', format='\\1 \\2', leading_digits_pattern=['5[079]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{6})', format='\\1', leading_digits_pattern=['[18]']),
-        NumberFormat(pattern='(\\d{3})(\\d{3,10})', format='\\1 \\2', leading_digits_pattern=['(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]'], national_prefix_formatting_rule='0\\1'),
+        NumberFormat(pattern='(\\d{3})(\\d{3,10})', format='\\1 \\2', leading_digits_pattern=['(?:31|4)6|51|6(?:48|5[0-3579]|[6-9])|7(?:20|32|8)|[89]', '(?:31|4)6|51|6(?:485|5[0-3579]|[6-9])|7(?:20|32|8)|[89]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{4})(\\d{3,9})', format='\\1 \\2', leading_digits_pattern=['[2-467]|5[2-6]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['5'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4,7})', format='\\1 \\2 \\3', leading_digits_pattern=['5'], national_prefix_formatting_rule='0\\1')],
     intl_number_format=[NumberFormat(pattern='(\\d)(\\d{3,12})', format='\\1 \\2', leading_digits_pattern=['1(?:11|[2-9])']),
         NumberFormat(pattern='(\\d{3})(\\d{2})', format='\\1 \\2', leading_digits_pattern=['517']),
         NumberFormat(pattern='(\\d{2})(\\d{3,5})', format='\\1 \\2', leading_digits_pattern=['5[079]']),
-        NumberFormat(pattern='(\\d{3})(\\d{3,10})', format='\\1 \\2', leading_digits_pattern=['(?:31|4)6|51|6(?:5[0-3579]|[6-9])|7(?:20|32|8)|[89]']),
+        NumberFormat(pattern='(\\d{3})(\\d{3,10})', format='\\1 \\2', leading_digits_pattern=['(?:31|4)6|51|6(?:48|5[0-3579]|[6-9])|7(?:20|32|8)|[89]', '(?:31|4)6|51|6(?:485|5[0-3579]|[6-9])|7(?:20|32|8)|[89]']),
         NumberFormat(pattern='(\\d{4})(\\d{3,9})', format='\\1 \\2', leading_digits_pattern=['[2-467]|5[2-6]']),
         NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['5']),
         NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4,7})', format='\\1 \\2 \\3', leading_digits_pattern=['5'])],

phonenumbers/data/region_BI.py

@@ -4,5 +4,5 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 PHONE_METADATA_BI = PhoneMetadata(id='BI', country_code=257, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:[267]\\d|31)\\d{6}', possible_length=(8,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:22|31)\\d{6}', example_number='22201234', possible_length=(8,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:29|[67][125-9])\\d{6}', example_number='79561234', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='64[0-2]\\d{5}|(?:29|[67][125-9])\\d{6}', example_number='79561234', possible_length=(8,)),
     number_format=[NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['[2367]'])])

phonenumbers/data/region_BR.py

@@ -2,24 +2,24 @@
 from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_BR = PhoneMetadata(id='BR', country_code=55, international_prefix='00(?:1[245]|2[1-35]|31|4[13]|[56]5|99)',
-    general_desc=PhoneNumberDesc(national_number_pattern='(?:[1-46-9]\\d\\d|5(?:[0-46-9]\\d|5[0-46-9]))\\d{8}|[1-9]\\d{9}|[3589]\\d{8}|[34]\\d{7}', possible_length=(8, 9, 10, 11)),
+    general_desc=PhoneNumberDesc(national_number_pattern='[1-467]\\d{9,10}|55[0-46-9]\\d{8}|[34]\\d{7}|55\\d{7,8}|(?:5[0-46-9]|[89]\\d)\\d{7,9}', possible_length=(8, 9, 10, 11)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-5]\\d{7}', example_number='1123456789', possible_length=(10,), possible_length_local_only=(8,)),
     mobile=PhoneNumberDesc(national_number_pattern='(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])(?:7|9\\d)\\d{7}', example_number='11961234567', possible_length=(10, 11), possible_length_local_only=(8, 9)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6,7}', example_number='800123456', possible_length=(9, 10)),
-    premium_rate=PhoneNumberDesc(national_number_pattern='300\\d{6}|[59]00\\d{6,7}', example_number='300123456', possible_length=(9, 10)),
-    shared_cost=PhoneNumberDesc(national_number_pattern='(?:30[03]\\d{3}|4(?:0(?:0\\d|20)|370))\\d{4}|300\\d{5}', example_number='40041234', possible_length=(8, 10)),
-    no_international_dialling=PhoneNumberDesc(national_number_pattern='30(?:0\\d{5,7}|3\\d{7})|40(?:0\\d|20)\\d{4}|800\\d{6,7}', possible_length=(8, 9, 10)),
+    premium_rate=PhoneNumberDesc(national_number_pattern='[59]00\\d{6,7}', example_number='500123456', possible_length=(9, 10)),
+    shared_cost=PhoneNumberDesc(national_number_pattern='(?:30[03]\\d{3}|4(?:0(?:0\\d|20)|370|864))\\d{4}|300\\d{5}', example_number='40041234', possible_length=(8, 10)),
+    no_international_dialling=PhoneNumberDesc(national_number_pattern='(?:30[03]\\d{3}|4(?:0(?:0\\d|20)|864))\\d{4}|800\\d{6,7}|300\\d{5}', possible_length=(8, 9, 10)),
     national_prefix='0',
     national_prefix_for_parsing='(?:0|90)(?:(1[245]|2[1-35]|31|4[13]|[56]5|99)(\\d{10,11}))?',
     national_prefix_transform_rule='\\2',
     number_format=[NumberFormat(pattern='(\\d{3,6})', format='\\1', leading_digits_pattern=['1(?:1[25-8]|2[357-9]|3[02-68]|4[12568]|5|6[0-8]|8[015]|9[0-47-9])|321|610']),
-        NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['300|4(?:0[02]|37)', '4(?:02|37)0|[34]00']),
+        NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['300|4(?:0[02]|37|86)', '300|4(?:0(?:0|20)|370|864)']),
         NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['[2-57]', '[2357]|4(?:[0-24-9]|3(?:[0-689]|7[1-9]))']),
         NumberFormat(pattern='(\\d{3})(\\d{2,3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['(?:[358]|90)0'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{5})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['9']),
         NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2-\\3', leading_digits_pattern=['(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-57]'], national_prefix_formatting_rule='(\\1)', domestic_carrier_code_formatting_rule='0 $CC (\\1)'),
         NumberFormat(pattern='(\\d{2})(\\d{5})(\\d{4})', format='\\1 \\2-\\3', leading_digits_pattern=['[16][1-9]|[2-57-9]'], national_prefix_formatting_rule='(\\1)', domestic_carrier_code_formatting_rule='0 $CC (\\1)')],
-    intl_number_format=[NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['300|4(?:0[02]|37)', '4(?:02|37)0|[34]00']),
+    intl_number_format=[NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1-\\2', leading_digits_pattern=['300|4(?:0[02]|37|86)', '300|4(?:0(?:0|20)|370|864)']),
         NumberFormat(pattern='(\\d{3})(\\d{2,3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['(?:[358]|90)0']),
         NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2-\\3', leading_digits_pattern=['(?:[14689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-57]']),
         NumberFormat(pattern='(\\d{2})(\\d{5})(\\d{4})', format='\\1 \\2-\\3', leading_digits_pattern=['[16][1-9]|[2-57-9]'])],

phonenumbers/data/region_GD.py

@@ -3,8 +3,8 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_GD = PhoneMetadata(id='GD', country_code=1, international_prefix='011',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:473|[58]\\d\\d|900)\\d{7}', possible_length=(10,), possible_length_local_only=(7,)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='473(?:2(?:3[0-2]|69)|3(?:2[89]|86)|4(?:[06]8|3[5-9]|4[0-4]|5[579]|73|90)|63[68]|7(?:58|84)|800|938)\\d{4}', example_number='4732691234', possible_length=(10,), possible_length_local_only=(7,)),
-    mobile=PhoneNumberDesc(national_number_pattern='473(?:4(?:0[2-79]|1[04-9]|2[0-5]|49|5[68])|5(?:2[01]|3[3-8])|901)\\d{4}', example_number='4734031234', possible_length=(10,), possible_length_local_only=(7,)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='473(?:2(?:3[0-2]|69)|3(?:2[89]|86)|4(?:[06]8|3[5-9]|4[0-4]|5[59]|73|90)|63[68]|7(?:58|84)|800|938)\\d{4}', example_number='4732691234', possible_length=(10,), possible_length_local_only=(7,)),
+    mobile=PhoneNumberDesc(national_number_pattern='473(?:4(?:0[2-79]|1[04-9]|2[0-5]|49|5[6-8])|5(?:2[01]|3[3-8])|901)\\d{4}', example_number='4734031234', 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='8002123456', possible_length=(10,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900[2-9]\\d{6}', example_number='9002123456', 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,)),

phonenumbers/data/region_HK.py

@@ -4,7 +4,7 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 PHONE_METADATA_HK = PhoneMetadata(id='HK', country_code=852, international_prefix='00(?:30|5[09]|[126-9]?)',
     general_desc=PhoneNumberDesc(national_number_pattern='8[0-46-9]\\d{6,7}|9\\d{4,7}|(?:[2-7]|9\\d{3})\\d{7}', possible_length=(5, 6, 7, 8, 9, 11)),
     fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:[13-9]\\d|2[013-9])\\d|3(?:(?:[1569][0-24-9]|4[0-246-9]|7[0-24-69])\\d|8(?:4[0-8]|[579]\\d|6[0-2]))|58(?:0[1-9]|1[2-9]))\\d{4}', example_number='21234567', possible_length=(8,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:4(?:44[0-35-9]|6(?:1[0-79]|4[0-57-9]|6[0-4])|7(?:4[0-28]|6[0-5]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[015])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', example_number='51234567', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:4(?:44[0-35-9]|6(?:1[0-79]|4[0-57-9]|6[0-4])|7(?:[26][0-5]|4[0-28]))|5(?:73[0-6]|95[0-8])|6(?:26[013-8]|66[0-3]|78[0-5])|70(?:7[1-8]|8[0-4])|84(?:4[0-2]|8[0-35-9])|9(?:29[013-9]|39[014-9]|59[0-4]|899))\\d{4}|(?:4(?:4[0-35-9]|6[02357-9]|7[015])|5(?:[1-59][0-46-9]|6[0-4689]|7[0-246-9])|6(?:0[1-9]|[13-59]\\d|[268][0-57-9]|7[0-79])|70[1-59]|84[0-39]|9(?:0[1-9]|1[02-9]|[2358][0-8]|[467]\\d))\\d{5}', example_number='51234567', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6}', example_number='800123456', possible_length=(9,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900(?:[0-24-9]\\d{7}|3\\d{1,4})', example_number='90012345678', possible_length=(5, 6, 7, 8, 11)),
     personal_number=PhoneNumberDesc(national_number_pattern='8(?:1[0-4679]\\d|2(?:[0-36]\\d|7[0-4])|3(?:[034]\\d|2[09]|70))\\d{4}', example_number='81123456', possible_length=(8,)),

phonenumbers/data/region_HR.py

@@ -2,16 +2,16 @@
 from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_HR = PhoneMetadata(id='HR', country_code=385, international_prefix='00',
-    general_desc=PhoneNumberDesc(national_number_pattern='(?:[24-69]\\d|3[0-79])\\d{7}|80\\d{5,7}|[1-79]\\d{7}|6\\d{5,6}', possible_length=(6, 7, 8, 9)),
+    general_desc=PhoneNumberDesc(national_number_pattern='[2-69]\\d{8}|80\\d{5,7}|[1-79]\\d{7}|6\\d{6}', possible_length=(7, 8, 9), possible_length_local_only=(6,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='1\\d{7}|(?:2[0-3]|3[1-5]|4[02-47-9]|5[1-3])\\d{6,7}', example_number='12345678', possible_length=(8, 9), possible_length_local_only=(6, 7)),
     mobile=PhoneNumberDesc(national_number_pattern='9(?:(?:0[1-9]|[12589]\\d)\\d\\d|7(?:[0679]\\d\\d|5(?:[01]\\d|44|55|77|9[5-79])))\\d{4}|98\\d{6}', example_number='921234567', possible_length=(8, 9)),
     toll_free=PhoneNumberDesc(national_number_pattern='80\\d{5,7}', example_number='800123456', possible_length=(7, 8, 9)),
-    premium_rate=PhoneNumberDesc(national_number_pattern='6[01459]\\d{6}|6[01]\\d{4,5}', example_number='611234', possible_length=(6, 7, 8)),
+    premium_rate=PhoneNumberDesc(national_number_pattern='6[01459]\\d{6}|6[01]\\d{5}', example_number='6001234', possible_length=(7, 8)),
     personal_number=PhoneNumberDesc(national_number_pattern='7[45]\\d{6}', example_number='74123456', possible_length=(8,)),
     uan=PhoneNumberDesc(national_number_pattern='62\\d{6,7}|72\\d{6}', example_number='62123456', possible_length=(8, 9)),
     national_prefix='0',
     national_prefix_for_parsing='0',
-    number_format=[NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3', leading_digits_pattern=['6[01]'], national_prefix_formatting_rule='0\\1'),
+    number_format=[NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['6[01]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2,3})', format='\\1 \\2 \\3', leading_digits_pattern=['8'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d)(\\d{4})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['1'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['6|7[245]'], national_prefix_formatting_rule='0\\1'),

phonenumbers/data/region_LB.py

@@ -3,8 +3,8 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_LB = PhoneMetadata(id='LB', country_code=961, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='[27-9]\\d{7}|[13-9]\\d{6}', possible_length=(7, 8)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='7(?:62|8[0-7]|9[04-9])\\d{4}|(?:[14-69]\\d|2(?:[14-69]\\d|[78][1-9])|7[2-57]|8[02-9])\\d{5}', example_number='1123456', possible_length=(7, 8)),
-    mobile=PhoneNumberDesc(national_number_pattern='793(?:[01]\\d|2[0-4])\\d{3}|(?:(?:3|81)\\d|7(?:[01]\\d|6[013-9]|8[89]|9[12]))\\d{5}', example_number='71123456', possible_length=(7, 8)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='7(?:62|8[0-6]|9[04-9])\\d{4}|(?:[14-69]\\d|2(?:[14-69]\\d|[78][1-9])|7[2-57]|8[02-9])\\d{5}', example_number='1123456', possible_length=(7, 8)),
+    mobile=PhoneNumberDesc(national_number_pattern='787\\d{4}|(?:(?:3|81)\\d|7(?:[01]\\d|6[013-9]|8[89]|9[1-3]))\\d{5}', example_number='71123456', possible_length=(7, 8)),
     premium_rate=PhoneNumberDesc(national_number_pattern='9[01]\\d{6}', example_number='90123456', possible_length=(8,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='80\\d{6}', example_number='80123456', possible_length=(8,)),
     national_prefix='0',

phonenumbers/data/region_MU.py

@@ -3,11 +3,12 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_MU = PhoneMetadata(id='MU', country_code=230, international_prefix='0(?:0|[24-7]0|3[03])',
     general_desc=PhoneNumberDesc(national_number_pattern='(?:[57]|8\\d\\d)\\d{7}|[2-468]\\d{6}', possible_length=(7, 8, 10)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:[0346-8]\\d|1[0-7])|4(?:[013568]\\d|2[4-8]|71|90)|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}', example_number='54480123', possible_length=(7, 8)),
-    mobile=PhoneNumberDesc(national_number_pattern='5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-4]|3[013]))\\d{5}', example_number='52512345', possible_length=(8,)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:[0346-8]\\d|1[0-8])|4(?:[013568]\\d|2[4-8]|71|90)|54(?:[3-5]\\d|71)|6\\d\\d|8(?:14|3[129]))\\d{4}', example_number='54480123', possible_length=(7, 8)),
+    mobile=PhoneNumberDesc(national_number_pattern='5(?:4(?:2[1-389]|7[1-9])|87[15-8])\\d{4}|(?:5(?:2[5-9]|4[3-689]|[57]\\d|8[0-689]|9[0-8])|7(?:0[0-6]|3[013]))\\d{5}', example_number='52512345', possible_length=(8,)),
     toll_free=PhoneNumberDesc(national_number_pattern='802\\d{7}|80[0-2]\\d{4}', example_number='8001234', possible_length=(7, 10)),
     premium_rate=PhoneNumberDesc(national_number_pattern='30\\d{5}', example_number='3012345', possible_length=(7,)),
     voip=PhoneNumberDesc(national_number_pattern='3(?:20|9\\d)\\d{4}', example_number='3201234', possible_length=(7,)),
+    pager=PhoneNumberDesc(national_number_pattern='219\\d{4}', example_number='2190123', possible_length=(7,)),
     preferred_international_prefix='020',
     number_format=[NumberFormat(pattern='(\\d{3})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[2-46]|8[013]']),
         NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1 \\2', leading_digits_pattern=['[57]']),

phonenumbers/data/region_MX.py

@@ -3,8 +3,8 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_MX = PhoneMetadata(id='MX', country_code=52, international_prefix='0[09]',
     general_desc=PhoneNumberDesc(national_number_pattern='[2-9]\\d{9}', possible_length=(10,), possible_length_local_only=(7, 8)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[267][1-9]|3[1-8]|[45]\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[0-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}', example_number='2001234567', possible_length=(10,), possible_length_local_only=(7, 8)),
-    mobile=PhoneNumberDesc(national_number_pattern='657[12]\\d{6}|(?:2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[267][1-9]|3[1-8]|[45]\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-3689]|6[0-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}', example_number='2221234567', possible_length=(10,), possible_length_local_only=(7, 8)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:0[01]|2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[267][1-9]|3[1-8]|[45]\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-36-9]|6[0-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}', example_number='2001234567', possible_length=(10,), possible_length_local_only=(7, 8)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:2(?:2\\d|3[1-35-8]|4[13-9]|7[1-689]|8[1-578]|9[467])|3(?:1[1-79]|[2458][1-9]|3\\d|7[1-8]|9[1-5])|4(?:1[1-57-9]|[267][1-9]|3[1-8]|[45]\\d|8[1-35-9]|9[2-689])|5(?:[56]\\d|88|9[1-79])|6(?:1[2-68]|[2-4][1-9]|5[1-36-9]|6[0-57-9]|7[1-7]|8[67]|9[4-8])|7(?:[1346][1-9]|[27]\\d|5[13-9]|8[1-69]|9[17])|8(?:1\\d|2[13-689]|3[1-6]|4[124-6]|6[1246-9]|7[0-378]|9[12479])|9(?:1[346-9]|2[1-4]|3[2-46-8]|5[1348]|[69]\\d|7[12]|8[1-8]))\\d{7}', example_number='2221234567', possible_length=(10,), possible_length_local_only=(7, 8)),
     toll_free=PhoneNumberDesc(national_number_pattern='8(?:00|88)\\d{7}', example_number='8001234567', possible_length=(10,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{7}', example_number='9001234567', possible_length=(10,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='300\\d{7}', example_number='3001234567', possible_length=(10,)),

phonenumbers/data/region_NG.py

@@ -2,15 +2,14 @@
 from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_NG = PhoneMetadata(id='NG', country_code=234, international_prefix='009',
-    general_desc=PhoneNumberDesc(national_number_pattern='38\\d{6}|[78]\\d{9,13}|(?:20|9\\d)\\d{8}', possible_length=(8, 10, 11, 12, 13, 14), possible_length_local_only=(6, 7)),
-    fixed_line=PhoneNumberDesc(national_number_pattern='(?:20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])|38)\\d{6}', example_number='2033123456', possible_length=(8, 10), possible_length_local_only=(6, 7)),
+    general_desc=PhoneNumberDesc(national_number_pattern='(?:20|9\\d)\\d{8}|[78]\\d{9,13}', possible_length=(10, 11, 12, 13, 14), possible_length_local_only=(6, 7)),
+    fixed_line=PhoneNumberDesc(national_number_pattern='20(?:[1259]\\d|3[013-9]|4[1-8]|6[024-689]|7[1-79]|8[2-9])\\d{6}', example_number='2033123456', possible_length=(10,), possible_length_local_only=(6, 7)),
     mobile=PhoneNumberDesc(national_number_pattern='(?:702[0-24-9]|819[01])\\d{6}|(?:7(?:0[13-9]|[12]\\d)|8(?:0[1-9]|1[0-8])|9(?:0[1-9]|1[1-6]))\\d{7}', example_number='8021234567', possible_length=(10,)),
     toll_free=PhoneNumberDesc(national_number_pattern='800\\d{7,11}', example_number='80017591759', possible_length=(10, 11, 12, 13, 14)),
     uan=PhoneNumberDesc(national_number_pattern='700\\d{7,11}', example_number='7001234567', possible_length=(10, 11, 12, 13, 14)),
     national_prefix='0',
     national_prefix_for_parsing='0',
-    number_format=[NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{2,3})', format='\\1 \\2 \\3', leading_digits_pattern=['3'], national_prefix_formatting_rule='0\\1'),
-        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[7-9]'], national_prefix_formatting_rule='0\\1'),
+    number_format=[NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[7-9]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['20[129]'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{4})(\\d{2})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['2'], national_prefix_formatting_rule='0\\1'),
         NumberFormat(pattern='(\\d{3})(\\d{4})(\\d{4,5})', format='\\1 \\2 \\3', leading_digits_pattern=['[78]'], national_prefix_formatting_rule='0\\1'),

phonenumbers/data/region_RE.py

@@ -4,7 +4,7 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 PHONE_METADATA_RE = PhoneMetadata(id='RE', country_code=262, international_prefix='00',
     general_desc=PhoneNumberDesc(national_number_pattern='709\\d{6}|(?:26|[689]\\d)\\d{7}', possible_length=(9,)),
     fixed_line=PhoneNumberDesc(national_number_pattern='26(?:2\\d\\d|3(?:0\\d|1[0-6]))\\d{4}', example_number='262161234', possible_length=(9,)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:69(?:2\\d\\d|3(?:[06][0-6]|1[013]|2[0-2]|3[0-39]|4\\d|5[0-5]|7[0-37]|8[0-8]|9[0-479]))|7092[0-3])\\d{4}', example_number='692123456', possible_length=(9,)),
+    mobile=PhoneNumberDesc(national_number_pattern='(?:69(?:2\\d\\d|3(?:[06][0-6]|1[0-3]|2[0-2]|3[0-39]|4\\d|5[0-5]|7[0-37]|8[0-8]|9[0-479]))|7092[0-3])\\d{4}', example_number='692123456', possible_length=(9,)),
     toll_free=PhoneNumberDesc(national_number_pattern='80\\d{7}', example_number='801234567', possible_length=(9,)),
     premium_rate=PhoneNumberDesc(national_number_pattern='89[1-37-9]\\d{6}', example_number='891123456', possible_length=(9,)),
     shared_cost=PhoneNumberDesc(national_number_pattern='8(?:1[019]|2[0156]|84|90)\\d{6}', example_number='810123456', possible_length=(9,)),

phonenumbers/data/region_SG.py

@@ -4,7 +4,7 @@ from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 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='896[0-8]\\d{4}|(?:8(?:0[1-9]|[1-8]\\d|9[0-5])|9[0-8]\\d)\\d{5}', example_number='81234567', possible_length=(8,)),
+    mobile=PhoneNumberDesc(national_number_pattern='8970\\d{4}|(?:8(?:0[1-9]|[1-8]\\d|9[0-6])|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,)),

phonenumbers/data/region_SY.py

@@ -2,10 +2,10 @@
 from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
 
 PHONE_METADATA_SY = PhoneMetadata(id='SY', country_code=963, international_prefix='00',
-    general_desc=PhoneNumberDesc(national_number_pattern='[1-359]\\d{8}|[1-5]\\d{7}', possible_length=(8, 9), possible_length_local_only=(6, 7)),
+    general_desc=PhoneNumberDesc(national_number_pattern='[1-39]\\d{8}|[1-5]\\d{7}', possible_length=(8, 9), possible_length_local_only=(6, 7)),
     fixed_line=PhoneNumberDesc(national_number_pattern='21\\d{6,7}|(?:1(?:[14]\\d|[2356])|2[235]|3(?:[13]\\d|4)|4[134]|5[1-3])\\d{6}', example_number='112345678', possible_length=(8, 9), possible_length_local_only=(6, 7)),
-    mobile=PhoneNumberDesc(national_number_pattern='(?:50|9[1-689])\\d{7}', example_number='944567890', possible_length=(9,)),
+    mobile=PhoneNumberDesc(national_number_pattern='9[1-9]\\d{7}', example_number='944567890', possible_length=(9,)),
     national_prefix='0',
     national_prefix_for_parsing='0',
-    number_format=[NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[1-4]|5[1-3]'], national_prefix_formatting_rule='0\\1', national_prefix_optional_when_formatting=True),
-        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['[59]'], national_prefix_formatting_rule='0\\1', national_prefix_optional_when_formatting=True)])
+    number_format=[NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['[1-5]'], national_prefix_formatting_rule='0\\1', national_prefix_optional_when_formatting=True),
+        NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['9'], national_prefix_formatting_rule='0\\1', national_prefix_optional_when_formatting=True)])

phonenumbers/geodata/data10.py

@@ -19,6 +19,23 @@ from ..util import u
 # limitations under the License.
 
 data = {
+ '61350395':{'en': 'Mildura'},
+ '61350396':{'en': 'Ultima'},
+ '61350397':{'en': 'Ultima'},
+ '61350398':{'en': 'Ultima'},
+ '61350399':{'en': 'Ultima'},
+ '61350400':{'en': 'Annuello'},
+ '61350401':{'en': 'Curyo'},
+ '61350402':{'en': 'Hopetoun'},
+ '61350403':{'en': 'Patchewollock'},
+ '61350404':{'en': 'Turriff'},
+ '61350405':{'en': 'Woomelang'},
+ '61350406':{'en': 'Anabranch'},
+ '61350407':{'en': 'Arumpo'},
+ '61350408':{'en': 'Boundary Bend'},
+ '61350409':{'en': 'Karawinna'},
+ '61350410':{'en': 'Mildura'},
+ '61350411':{'en': 'Nangiloc'},
  '61350412':{'en': 'Palinyewah'},
  '61350413':{'en': 'Pan Ban'},
  '61350414':{'en': 'Pooncarie'},
@@ -10002,21 +10019,4 @@ data = {
  '61728017':{'en': 'Ipswich'},
  '61728018':{'en': 'Beenleigh'},
  '61728019':{'en': 'Cleveland'},
- '61728020':{'en': 'Ipswich'},
- '61728021':{'en': 'Beenleigh'},
- '61728022':{'en': 'Cleveland'},
- '61728023':{'en': 'Ipswich'},
- '6172889':{'en': 'Beenleigh'},
- '6172891':{'en': 'Beenleigh'},
- '6173018':{'en': 'Brisbane'},
- '6173019':{'en': 'Brisbane'},
- '617303':{'en': 'Brisbane'},
- '61730380':{'en': 'Samford'},
- '61730381':{'en': 'Cleveland'},
- '61730382':{'en': 'Beenleigh'},
- '61730385':{'en': 'Beenleigh'},
- '61730386':{'en': 'Cleveland'},
- '61730387':{'en': 'Ipswich'},
- '61730388':{'en': 'Redcliffe'},
- '61730389':{'en': 'Samford'},
 }

phonenumbers/geodata/data11.py

@@ -19,6 +19,23 @@ from ..util import u
 # limitations under the License.
 
 data = {
+ '61728020':{'en': 'Ipswich'},
+ '61728021':{'en': 'Beenleigh'},
+ '61728022':{'en': 'Cleveland'},
+ '61728023':{'en': 'Ipswich'},
+ '6172889':{'en': 'Beenleigh'},
+ '6172891':{'en': 'Beenleigh'},
+ '6173018':{'en': 'Brisbane'},
+ '6173019':{'en': 'Brisbane'},
+ '617303':{'en': 'Brisbane'},
+ '61730380':{'en': 'Samford'},
+ '61730381':{'en': 'Cleveland'},
+ '61730382':{'en': 'Beenleigh'},
+ '61730385':{'en': 'Beenleigh'},
+ '61730386':{'en': 'Cleveland'},
+ '61730387':{'en': 'Ipswich'},
+ '61730388':{'en': 'Redcliffe'},
+ '61730389':{'en': 'Samford'},
  '61730396':{'en': 'Ipswich'},
  '61730397':{'en': 'Ipswich'},
  '61730398':{'en': 'Redcliffe'},
@@ -10002,21 +10019,4 @@ data = {
  '61752934':{'en': 'Caloundra'},
  '61752935':{'en': 'Caloundra'},
  '61752936':{'en': 'Caloundra'},
- '61752937':{'en': 'Nambour'},
- '61752938':{'en': 'Nambour'},
- '61752939':{'en': 'Nambour'},
- '6175294':{'en': 'Nambour'},
- '61752947':{'en': 'Caboolture'},
- '61752948':{'en': 'Caboolture'},
- '61752949':{'en': 'Caboolture'},
- '61753000':{'en': 'Rosevale'},
- '61753001':{'en': 'Rosewood'},
- '61753002':{'en': 'Thornton'},
- '61753003':{'en': 'Woodbine'},
- '61753004':{'en': 'Ballugan'},
- '61753005':{'en': 'Gunalda'},
- '61753006':{'en': 'Gympie'},
- '61753007':{'en': 'Imbil'},
- '61753008':{'en': 'Kia Ora'},
- '61753009':{'en': 'Kilkivan'},
 }