Skip to content

Commit b452554

Browse files
daviddrysdaledaviddrysdale
committed
Merge branch 'dev' into python3
Conflicts: python/phonenumbers/data/region_AM.py python/phonenumbers/data/region_AZ.py python/phonenumbers/data/region_BR.py python/phonenumbers/data/region_CR.py python/phonenumbers/data/region_DE.py python/phonenumbers/data/region_DJ.py python/phonenumbers/data/region_EE.py python/phonenumbers/data/region_EG.py python/phonenumbers/data/region_GH.py python/phonenumbers/data/region_JP.py python/phonenumbers/data/region_KR.py python/phonenumbers/data/region_LB.py python/phonenumbers/data/region_LU.py python/phonenumbers/data/region_NZ.py python/tests/asyoutypetest.py python/tests/phonenumbermatchertest.py python/tests/phonenumberutiltest.py python/tests/shortnumberutiltest.py
2 parents c90d133 + 2bdf952 commit b452554

53 files changed

Lines changed: 641 additions & 473 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎python/HISTORY‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,11 @@
11

2+
=====================
3+
What's new in 4.6b1
4+
=====================
5+
6+
Merge up to upstream Subversion revision 431.
7+
8+
29
=====================
310
What's new in 4.6b1
411
=====================

‎python/makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ install: alldata
6666
clean: coverage_clean profile_clean
6767
rm -f MANIFEST *.pyc phonenumbers/*.pyc phonenumbers/data/*.pyc phonenumbers/geodata/*.pyc
6868
rm -rf phonenumbers/__pycache__ phonenumbers/data/__pycache__ phonenumbers/geodata/__pycache__
69-
rm -f phonenumbers/*.py,cover
69+
rm -f phonenumbers/*.py,cover .coverage*
7070
rm -f tests/*.pyc tests/testdata/*.pyc tests/testgeodata/*.pyc
7171
rm -rf tests/__pycache__ tests/testdata/__pycache__ tests/testgeodata/__pycache__
7272
rm -rf build deb_dist dist

‎python/phonenumbers/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@
121121

122122
# Version number is taken from the upstream libphonenumber version
123123
# together with an indication of the version of the Python-specific code.
124-
__version__ = "4.6b1"
124+
__version__ = "4.7b1"
125125

126126
__all__ = ['PhoneNumber', 'CountryCodeSource', 'FrozenPhoneNumber',
127127
'REGION_CODE_FOR_NON_GEO_ENTITY', 'NumberFormat', 'PhoneNumberDesc', 'PhoneMetadata',

‎python/phonenumbers/data/region_AC.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
33

44
PHONE_METADATA_AC = PhoneMetadata(id='AC', country_code=247, international_prefix='00',
5-
general_desc=PhoneNumberDesc(national_number_pattern='[2-46]\\d{3}', possible_number_pattern='\\d{4}'),
6-
fixed_line=PhoneNumberDesc(national_number_pattern='(?:3[0-5]|4[4-6]|[26]\\d)\\d{2}', possible_number_pattern='\\d{4}', example_number='6889'),
5+
general_desc=PhoneNumberDesc(national_number_pattern='[2-467]\\d{3}', possible_number_pattern='\\d{4}'),
6+
fixed_line=PhoneNumberDesc(national_number_pattern='(?:3[0-5]|4[4-6]|[26]\\d|70)\\d{2}', possible_number_pattern='\\d{4}', example_number='6889'),
77
mobile=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
88
toll_free=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
99
premium_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),

‎python/phonenumbers/data/region_AM.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
33

44
PHONE_METADATA_AM = PhoneMetadata(id='AM', country_code=374, international_prefix='00',
5-
general_desc=PhoneNumberDesc(national_number_pattern='[1-35-9]\\d{7}', possible_number_pattern='\\d{5,8}'),
6-
fixed_line=PhoneNumberDesc(national_number_pattern='(?:10\\d|2(?:2[2-46]|3[1-8]|4[2-69]|5[2-7]|6[1-9]|8[1-7])|3[12]2)\\d{5}', possible_number_pattern='\\d{5,8}', example_number='10123456'),
5+
general_desc=PhoneNumberDesc(national_number_pattern='[1-9]\\d{7}', possible_number_pattern='\\d{5,8}'),
6+
fixed_line=PhoneNumberDesc(national_number_pattern='(?:10\\d|2(?:2[2-46]|3[1-8]|4[2-69]|5[2-7]|6[1-9]|8[1-7])|3[12]2|47\\d)\\d{5}', possible_number_pattern='\\d{5,8}', example_number='10123456'),
77
mobile=PhoneNumberDesc(national_number_pattern='(?:55|77|9[1-9])\\d{6}', possible_number_pattern='\\d{8}', example_number='77123456'),
88
toll_free=PhoneNumberDesc(national_number_pattern='800\\d{5}', possible_number_pattern='\\d{8}', example_number='80012345'),
99
premium_rate=PhoneNumberDesc(national_number_pattern='90[016]\\d{5}', possible_number_pattern='\\d{8}', example_number='90012345'),
@@ -17,7 +17,7 @@
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='(\\d{2})(\\d{6})', format='\\1 \\2', leading_digits_pattern=['1'], national_prefix_formatting_rule='(0\\1)'),
20+
number_format=[NumberFormat(pattern='(\\d{2})(\\d{6})', format='\\1 \\2', leading_digits_pattern=['1|47'], national_prefix_formatting_rule='(0\\1)'),
2121
NumberFormat(pattern='(\\d{2})(\\d{6})', format='\\1 \\2', leading_digits_pattern=['[5-7]|9[1-9]'], national_prefix_formatting_rule='0\\1'),
2222
NumberFormat(pattern='(\\d{3})(\\d{5})', format='\\1 \\2', leading_digits_pattern=['[23]'], national_prefix_formatting_rule='(0\\1)'),
2323
NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['8|90'], national_prefix_formatting_rule='0 \\1')])

‎python/phonenumbers/data/region_AT.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
PHONE_METADATA_AT = PhoneMetadata(id='AT', country_code=43, international_prefix='00',
55
general_desc=PhoneNumberDesc(national_number_pattern='[1-9]\\d{3,12}', possible_number_pattern='\\d{3,13}'),
6-
fixed_line=PhoneNumberDesc(national_number_pattern='1\\d{3,12}|(?:2(?:1[467]|2[134-8]|5[2357]|6[1-46-8]|7[1-8]|8[124-7]|9[1458])|3(?:1[1-8]|3[23568]|4[5-7]|5[1378]|6[1-38]|8[3-68])|4(?:2[1-8]|35|63|7[1368]|8[2457])|5(?:12|2[1-8]|3[357]|4[147]|5[12578]|6[37])|6(?:13|2[1-47]|4[1-35-8]|5[468]|62)|7(?:2[1-8]|3[25]|4[13478]|5[68]|6[16-8]|7[1-6]|9[45]))\\d{3,10}', possible_number_pattern='\\d{3,13}', example_number='1234567890'),
6+
fixed_line=PhoneNumberDesc(national_number_pattern='1\\d{3,12}|(?:2(?:1[467]|2[13-8]|5[2357]|6[1-46-8]|7[1-8]|8[124-7]|9[1458])|3(?:1[1-8]|3[23568]|4[5-7]|5[1378]|6[1-38]|8[3-68])|4(?:2[1-8]|35|63|7[1368]|8[2457])|5(?:12|2[1-8]|3[357]|4[147]|5[12578]|6[37])|6(?:13|2[1-47]|4[1-35-8]|5[468]|62)|7(?:2[1-8]|3[25]|4[13478]|5[68]|6[16-8]|7[1-6]|9[45]))\\d{3,10}', possible_number_pattern='\\d{3,13}', example_number='1234567890'),
77
mobile=PhoneNumberDesc(national_number_pattern='6(?:44|5[0-3579]|6[013-9]|[7-9]\\d)\\d{4,10}', possible_number_pattern='\\d{7,13}', example_number='644123456'),
88
toll_free=PhoneNumberDesc(national_number_pattern='80[02]\\d{6,10}', possible_number_pattern='\\d{9,13}', example_number='800123456'),
99
premium_rate=PhoneNumberDesc(national_number_pattern='(?:711|9(?:0[01]|3[019]))\\d{6,10}', possible_number_pattern='\\d{9,13}', example_number='900123456'),

‎python/phonenumbers/data/region_AZ.py‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
33

44
PHONE_METADATA_AZ = PhoneMetadata(id='AZ', country_code=994, international_prefix='00',
5-
general_desc=PhoneNumberDesc(national_number_pattern='[1-9]\\d{7,8}', possible_number_pattern='\\d{5,9}'),
6-
fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:(?:[28]\\d|9)\\d|02|1[0-589]|3[358]|4[013-79]|5[0-479]|6[02346-9]|7[0-24-8])|2(?:02\\d|1(?:2[0-8]|42|6)|2(?:2[0-79]|3[0-35]|42|[1-35-9]|)|3(?:3[0-58]|[0-24])|4(?:2[0124579]|[1468])|5(?:2[0124579]|5)|6(?:2\\d|3[0128]|[56])|79)|365?\\d|44\\d{2})\\d{5}', possible_number_pattern='\\d{5,9}', example_number='123123456'),
7-
mobile=PhoneNumberDesc(national_number_pattern='(?:[46]0|5[015]|7[07])\\d{7}', possible_number_pattern='\\d{9}', example_number='401234567'),
5+
general_desc=PhoneNumberDesc(national_number_pattern='[1-9]\\d{8}', possible_number_pattern='\\d{7,9}'),
6+
fixed_line=PhoneNumberDesc(national_number_pattern='(?:1[28]\\d|2(?:02|1[24]|2[2-4]|33|[45]2|6[23])|365)\\d{6}', possible_number_pattern='\\d{7,9}', example_number='123123456'),
7+
mobile=PhoneNumberDesc(national_number_pattern='(?:4[04]|5[015]|60|7[07])\\d{7}', possible_number_pattern='\\d{9}', example_number='401234567'),
88
toll_free=PhoneNumberDesc(national_number_pattern='88\\d{7}', possible_number_pattern='\\d{9}', example_number='881234567'),
99
premium_rate=PhoneNumberDesc(national_number_pattern='900200\\d{3}', possible_number_pattern='\\d{9}', example_number='900200123'),
1010
shared_cost=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
@@ -18,8 +18,5 @@
1818
national_prefix='0',
1919
national_prefix_for_parsing='0',
2020
number_format=[NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['(?:1[28]|2(?:[45]2|[0-36])|365)'], national_prefix_formatting_rule='(0\\1)'),
21-
NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['22'], national_prefix_formatting_rule='(0\\1)'),
22-
NumberFormat(pattern='(\\d{2})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['36[0-46-9]'], national_prefix_formatting_rule='(0\\1)'),
23-
NumberFormat(pattern='(\\d{3})(\\d)(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['1[013-79]|2(?:[45][13-9]|[7-9])'], national_prefix_formatting_rule='(0\\1)'),
2421
NumberFormat(pattern='(\\d{2})(\\d{3})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['[4-8]'], national_prefix_formatting_rule='0\\1'),
2522
NumberFormat(pattern='(\\d{3})(\\d{2})(\\d{2})(\\d{2})', format='\\1 \\2 \\3 \\4', leading_digits_pattern=['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[569]|55|7[0179])|50[34]\\d)\\d{4}', possible_number_pattern='\\d{8}', example_number='20491234'),
7-
mobile=PhoneNumberDesc(national_number_pattern='(?:60[0-3]|7(?:[02-68]\\d|1[0-4689]|7[0-6]|9[0-689]))\\d{5}', possible_number_pattern='\\d{8}', example_number='70123456'),
7+
mobile=PhoneNumberDesc(national_number_pattern='(?:6(?:0[0-3]|8\\d)|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_BR.py‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22
from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
33

44
PHONE_METADATA_BR = PhoneMetadata(id='BR', country_code=55, international_prefix='00(?:1[45]|2[135]|[34]1|43)',
5-
general_desc=PhoneNumberDesc(national_number_pattern='[1-9]\\d{7,9}', possible_number_pattern='\\d{8,10}'),
6-
fixed_line=PhoneNumberDesc(national_number_pattern='1[1-9][2-5]\\d{7}|(?:[4689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-5]\\d{7}', possible_number_pattern='\\d{8,10}', example_number='1123456789'),
7-
mobile=PhoneNumberDesc(national_number_pattern='1(?:1(?:[6-9]\\d|5[347])|[2-9][6-9]\\d)\\d{6}|(?:[4689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[6-9]\\d{7}', possible_number_pattern='\\d{10}', example_number='1161234567'),
8-
toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6,7}', possible_number_pattern='\\d{8,10}', example_number='800123456'),
9-
premium_rate=PhoneNumberDesc(national_number_pattern='[359]00\\d{6,7}', possible_number_pattern='\\d{8,10}', example_number='300123456'),
5+
general_desc=PhoneNumberDesc(national_number_pattern='[1-46-9]\\d{7,10}|5\\d{8,9}', possible_number_pattern='\\d{8,11}'),
6+
fixed_line=PhoneNumberDesc(national_number_pattern='1[1-9][2-5]\\d{7}|(?:[4689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[2-5]\\d{7}', possible_number_pattern='\\d{8,11}', example_number='1123456789'),
7+
mobile=PhoneNumberDesc(national_number_pattern='1(?:1(?:5[347]|[6-8]\\d|9\\d{1,2})|[2-9][6-9]\\d)\\d{6}|(?:[4689][1-9]|2[12478]|3[1-578]|5[13-5]|7[13-579])[6-9]\\d{7}', possible_number_pattern='\\d{10,11}', example_number='1161234567'),
8+
toll_free=PhoneNumberDesc(national_number_pattern='800\\d{6,7}', possible_number_pattern='\\d{8,11}', example_number='800123456'),
9+
premium_rate=PhoneNumberDesc(national_number_pattern='[359]00\\d{6,7}', possible_number_pattern='\\d{8,11}', example_number='300123456'),
1010
shared_cost=PhoneNumberDesc(national_number_pattern='[34]00\\d{5}', possible_number_pattern='\\d{8}', example_number='40041234'),
1111
personal_number=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1212
voip=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
@@ -16,8 +16,9 @@
1616
voicemail=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1717
no_international_dialling=PhoneNumberDesc(national_number_pattern='[34]00\\d{5}', possible_number_pattern='\\d{8}', example_number='40041234'),
1818
national_prefix='0',
19-
national_prefix_for_parsing='0(?:(1[245]|2[135]|[34]1)(\\d{10}))?',
19+
national_prefix_for_parsing='0(?:(1[245]|2[135]|[34]1)(\\d{10,11}))?',
2020
national_prefix_transform_rule='\\2',
21-
number_format=[NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2-\\3', leading_digits_pattern=['[1-9][1-9]'], national_prefix_formatting_rule='(\\1)', domestic_carrier_code_formatting_rule='0 $CC (\\1)'),
21+
number_format=[NumberFormat(pattern='(\\d{2})(\\d{5})(\\d{4})', format='\\1 \\2-\\3', leading_digits_pattern=['119'], national_prefix_formatting_rule='(\\1)', domestic_carrier_code_formatting_rule='0 $CC (\\1)'),
22+
NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{4})', format='\\1 \\2-\\3', leading_digits_pattern=['[1-9][1-9]'], national_prefix_formatting_rule='(\\1)', domestic_carrier_code_formatting_rule='0 $CC (\\1)'),
2223
NumberFormat(pattern='([34]00\\d)(\\d{4})', format='\\1-\\2', leading_digits_pattern=['[34]00']),
2324
NumberFormat(pattern='([3589]00)(\\d{2,3})(\\d{4})', format='\\1 \\2 \\3', leading_digits_pattern=['[3589]00'], national_prefix_formatting_rule='0\\1')])

‎python/phonenumbers/data/region_BY.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from ..phonemetadata import NumberFormat, PhoneNumberDesc, PhoneMetadata
33

44
PHONE_METADATA_BY = PhoneMetadata(id='BY', country_code=375, international_prefix='810',
5-
general_desc=PhoneNumberDesc(national_number_pattern='[12-4]\\d{8}|[89]\\d{9,10}', possible_number_pattern='\\d{7,11}'),
5+
general_desc=PhoneNumberDesc(national_number_pattern='[1-4]\\d{8}|[89]\\d{9,10}', possible_number_pattern='\\d{7,11}'),
66
fixed_line=PhoneNumberDesc(national_number_pattern='(?:1(?:5(?:1[1-5]|2\\d|6[1-4]|9[1-7])|6(?:[235]\\d|4[1-7])|7\\d{2})|2(?:1(?:[246]\\d|3[0-35-9]|5[1-9])|2(?:[235]\\d|4[0-8])|3(?:2\\d|3[02-79]|4[024-7]|5[0-7])))\\d{5}', possible_number_pattern='\\d{7,9}', example_number='152450911'),
77
mobile=PhoneNumberDesc(national_number_pattern='(?:2(?:5[5679]|9[1-9])|33\\d|44\\d)\\d{6}', possible_number_pattern='\\d{9}', example_number='294911911'),
88
toll_free=PhoneNumberDesc(national_number_pattern='8(?:0[13]|20\\d)\\d{7}', possible_number_pattern='\\d{10,11}', example_number='8011234567'),

0 commit comments

Comments
 (0)