Skip to content

Commit 9ac9d7a

Browse files
daviddrysdaledaviddrysdale
committed
Merge branch 'dev' into python3
Conflicts: python/phonenumbers/data/region_AT.py python/phonenumbers/data/region_RU.py python/phonenumbers/geodata/__init__.py
2 parents 9857e39 + b3c4c0c commit 9ac9d7a

15 files changed

Lines changed: 1445 additions & 230 deletions

File tree

‎python/phonenumbers/data/__init__.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -265,12 +265,13 @@
265265
from .region_ZA import PHONE_METADATA_ZA
266266
from .region_ZM import PHONE_METADATA_ZM
267267
from .region_ZW import PHONE_METADATA_ZW
268+
from .alt_format_43 import PHONE_ALT_FORMAT_43
268269
from .alt_format_44 import PHONE_ALT_FORMAT_44
269270
from .alt_format_49 import PHONE_ALT_FORMAT_49
270271
from .alt_format_55 import PHONE_ALT_FORMAT_55
271272
from .alt_format_61 import PHONE_ALT_FORMAT_61
272273
from .alt_format_81 import PHONE_ALT_FORMAT_81
273-
_ALT_NUMBER_FORMATS = {44: PHONE_ALT_FORMAT_44, 49: PHONE_ALT_FORMAT_49, 55: PHONE_ALT_FORMAT_55, 61: PHONE_ALT_FORMAT_61, 81: PHONE_ALT_FORMAT_81}
274+
_ALT_NUMBER_FORMATS = {43: PHONE_ALT_FORMAT_43, 44: PHONE_ALT_FORMAT_44, 49: PHONE_ALT_FORMAT_49, 55: PHONE_ALT_FORMAT_55, 61: PHONE_ALT_FORMAT_61, 81: PHONE_ALT_FORMAT_81}
274275

275276
# A mapping from a country code to the region codes which
276277
# denote the country/region represented by that country code.

‎python/phonenumbers/data/alt_format_43.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
"""Auto-generated file, do not edit by hand. 43 metadata"""
2+
from ..phonemetadata import NumberFormat
3+
4+
PHONE_ALT_FORMAT_43 = [NumberFormat(pattern='(5)(\\d{3,12})', format='\\1 \\2', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(50)(\\d{2})(\\d{2})(\\d{2,4})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['50']), NumberFormat(pattern='(5\\d)(\\d{2})(\\d{2})(\\d{2})(\\d{2,4})', format='\\1 \\2 \\3 \\4 \\5', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(5\\d)(\\d{5})(\\d{4,6})', format='\\1 \\2 \\3', leading_digits_pattern=['5[079]']), NumberFormat(pattern='(5\\d)(\\d{6,7})', format='\\1 \\2', leading_digits_pattern=['5[079]'])]

‎python/phonenumbers/data/region_AT.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@
1717
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1818
national_prefix='0',
1919
national_prefix_for_parsing='0',
20-
number_format=[NumberFormat(pattern='([15])(\\d{3,12})', format='\\1 \\2', leading_digits_pattern=['1|5[079]'], national_prefix_formatting_rule='0\\1'),
20+
number_format=[NumberFormat(pattern='(1)(\\d{3,12})', format='\\1 \\2', leading_digits_pattern=['1'], national_prefix_formatting_rule='0\\1'),
21+
NumberFormat(pattern='(5\\d)(\\d{3,5})', format='\\1 \\2', leading_digits_pattern=['5[079]'], national_prefix_formatting_rule='0\\1'),
22+
NumberFormat(pattern='(5\\d)(\\d{3})(\\d{3,4})', format='\\1 \\2 \\3', leading_digits_pattern=['5[079]'], national_prefix_formatting_rule='0\\1'),
23+
NumberFormat(pattern='(5\\d)(\\d{4})(\\d{4,7})', format='\\1 \\2 \\3', leading_digits_pattern=['5[079]'], national_prefix_formatting_rule='0\\1'),
2124
NumberFormat(pattern='(\\d{3})(\\d{3,10})', format='\\1 \\2', leading_digits_pattern=['316|46|51|732|6(?:44|5[0-3579]|[6-9])|7(?:1|[28]0)|[89]'], national_prefix_formatting_rule='0\\1'),
2225
NumberFormat(pattern='(\\d{4})(\\d{3,9})', format='\\1 \\2', leading_digits_pattern=['2|3(?:1[1-578]|[3-8])|4[2378]|5[2-6]|6(?:[12]|4[1-35-9]|5[468])|7(?:2[1-8]|35|4[1-8]|[57-9])'], national_prefix_formatting_rule='0\\1')])

‎python/phonenumbers/data/region_BF.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
PHONE_METADATA_BF = PhoneMetadata(id='BF', country_code=226, international_prefix='00',
55
general_desc=PhoneNumberDesc(national_number_pattern='[24-7]\\d{7}', possible_number_pattern='\\d{8}'),
66
fixed_line=PhoneNumberDesc(national_number_pattern='(?:20(?:49|5[23]|9[016-9])|40(?:4[56]|5[4-6]|7[0179])|50[34]\\d)\\d{4}', possible_number_pattern='\\d{8}', example_number='20491234'),
7-
mobile=PhoneNumberDesc(national_number_pattern='(?:6(?:0\\d|[18][01]|6[0-4])|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}', possible_number_pattern='\\d{8}', example_number='70123456'),
7+
mobile=PhoneNumberDesc(national_number_pattern='(?:6(?:0\\d|1[01]|6[0-4]|8[0-2])|7(?:[02-68]\\d|1[0-4689]|7[0-69]|9[0-689]))\\d{5}', possible_number_pattern='\\d{8}', example_number='70123456'),
88
toll_free=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
99
premium_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1010
shared_cost=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),

‎python/phonenumbers/data/region_JO.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
PHONE_METADATA_JO = PhoneMetadata(id='JO', country_code=962, international_prefix='00',
55
general_desc=PhoneNumberDesc(national_number_pattern='[235-9]\\d{7,8}', possible_number_pattern='\\d{7,9}'),
66
fixed_line=PhoneNumberDesc(national_number_pattern='(?:2(?:6(?:2[0-35-9]|3[0-57-8]|4[24-7]|5[0-24-8]|[6-9][02])|7(?:0[1-79]|10|2[014-7]|3[0-689]|4[019]|5[0-3578]))|32(?:0[1-69]|1[1-35-7]|2[024-7]|3\\d|[457][02]|60)|53(?:[013][02]|2[0-59]|49|5[0-35-9]|6[15]|7[45]|8[1-6]|9[0-36-9])|6(?:2[50]0|300|4(?:0[0125]|1[2-7]|2[0569]|[38][07-9]|4[025689]|6[0-589]|7\\d|9[0-2])|5(?:[01][056]|2[034]|3[0-57-9]|4[17-8]|5[0-69]|6[0-35-9]|7[1-379]|8[0-68]|9[02-39]))|87(?:[02]0|7[08]|9[09]))\\d{4}', possible_number_pattern='\\d{7,8}', example_number='62001234'),
7-
mobile=PhoneNumberDesc(national_number_pattern='7(?:5\\d|7[2-79]|8[5-8]|9[035-9])\\d{6}', possible_number_pattern='\\d{9}', example_number='790123456'),
7+
mobile=PhoneNumberDesc(national_number_pattern='7(?:55|7[25-79]|8[5-8]|9[05-9])\\d{6}', possible_number_pattern='\\d{9}', example_number='790123456'),
88
toll_free=PhoneNumberDesc(national_number_pattern='80\\d{6}', possible_number_pattern='\\d{8}', example_number='80012345'),
99
premium_rate=PhoneNumberDesc(national_number_pattern='900\\d{5}', possible_number_pattern='\\d{8}', example_number='90012345'),
1010
shared_cost=PhoneNumberDesc(national_number_pattern='85\\d{6}', possible_number_pattern='\\d{8}', example_number='85012345'),

‎python/phonenumbers/data/region_NG.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
PHONE_METADATA_NG = PhoneMetadata(id='NG', country_code=234, international_prefix='009',
55
general_desc=PhoneNumberDesc(national_number_pattern='[1-69]\\d{5,8}|[78]\\d{5,13}', possible_number_pattern='\\d{5,14}'),
66
fixed_line=PhoneNumberDesc(national_number_pattern='[12]\\d{6,7}|9\\d{7}|(?:3\\d|4[023568]|5[02368]|6[02-469]|7[4-69]|8[2-9])\\d{6}|(?:4[47]|5[14579]|6[1578]|7[0-357])\\d{5,6}|(?:78|41)\\d{5}', possible_number_pattern='\\d{5,9}', example_number='12345678'),
7-
mobile=PhoneNumberDesc(national_number_pattern='(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689])|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[3-9]\\d|2[1-9])|8(?:0[2-9]|1[0235689])\\d)\\d{6}', possible_number_pattern='\\d{8,10}', example_number='8021234567'),
7+
mobile=PhoneNumberDesc(national_number_pattern='(?:1(?:7[34]\\d|8(?:04|[124579]\\d|8[0-3])|95\\d)|287[0-7]|3(?:18[1-8]|88[0-7]|9(?:8[5-9]|6[1-5]))|4(?:28[0-2]|6(?:7[1-9]|8[02-47])|88[0-2])|5(?:2(?:7[7-9]|8\\d)|38[1-79]|48[0-7]|68[4-7])|6(?:2(?:7[7-9]|8\\d)|4(?:3[7-9]|[68][129]|7[04-69]|9[1-8])|58[0-2]|98[7-9])|7(?:38[0-7]|69[1-8]|78[2-4])|8(?:28[3-9]|38[0-2]|4(?:2[12]|3[147-9]|5[346]|7[4-9]|8[014-689])|58[1-8]|78[2-9]|88[5-7])|98[07]\\d)\\d{4}|(?:70(?:[3-9]\\d|2[1-9])|8(?:0[2-9]|1[0235-9])\\d)\\d{6}', possible_number_pattern='\\d{8,10}', example_number='8021234567'),
88
toll_free=PhoneNumberDesc(national_number_pattern='800\\d{7,11}', possible_number_pattern='\\d{10,14}', example_number='80017591759'),
99
premium_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1010
shared_cost=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),

‎python/phonenumbers/data/region_RU.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,9 @@
1818
preferred_international_prefix='8~10',
1919
national_prefix='8',
2020
national_prefix_for_parsing='8',
21-
number_format=[NumberFormat(pattern='([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2-\\3-\\4', leading_digits_pattern=['[34689]'], national_prefix_formatting_rule='8 (\\1)', national_prefix_optional_when_formatting=True),
21+
number_format=[NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2})', format='\\1-\\2-\\3', leading_digits_pattern=['[1-79]'], national_prefix_formatting_rule='\\1', national_prefix_optional_when_formatting=True),
22+
NumberFormat(pattern='([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2-\\3-\\4', leading_digits_pattern=['[34689]'], national_prefix_formatting_rule='8 (\\1)', national_prefix_optional_when_formatting=True),
2223
NumberFormat(pattern='(7\\d{2})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['7'], national_prefix_formatting_rule='8 (\\1)', national_prefix_optional_when_formatting=True)],
24+
intl_number_format=[NumberFormat(pattern='([3489]\\d{2})(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2-\\3-\\4', leading_digits_pattern=['[34689]']),
25+
NumberFormat(pattern='(7\\d{2})(\\d{3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['7'])],
2326
main_country_for_code=True)

‎python/phonenumbers/data/region_SL.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
PHONE_METADATA_SL = PhoneMetadata(id='SL', country_code=232, international_prefix='00',
55
general_desc=PhoneNumberDesc(national_number_pattern='[2-578]\\d{7}', possible_number_pattern='\\d{6,8}'),
66
fixed_line=PhoneNumberDesc(national_number_pattern='[235]2[2-4][2-9]\\d{4}', possible_number_pattern='\\d{6,8}', example_number='22221234'),
7-
mobile=PhoneNumberDesc(national_number_pattern='(?:25|3[03]|44|5[056]|7[6-9]|88)\\d{6}', possible_number_pattern='\\d{6,8}', example_number='25123456'),
7+
mobile=PhoneNumberDesc(national_number_pattern='(?:2[15]|3[034]|4[04]|5[05]|7[6-9]|88)\\d{6}', possible_number_pattern='\\d{6,8}', example_number='25123456'),
88
toll_free=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
99
premium_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1010
shared_cost=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),

0 commit comments

Comments
 (0)