Skip to content

Commit c58a79d

Browse files
daviddrysdaledaviddrysdale
committed
Merge branch 'dev' into python3
Conflicts: python/phonenumbers/phonemetadata.py python/phonenumbers/phonenumbermatcher.py python/phonenumbers/phonenumberutil.py python/tests/examplenumberstest.py python/tests/phonenumbermatchertest.py python/tests/phonenumberutiltest.py python/tests/shortnumberutiltest.py tools/python/makefile
2 parents 1e00295 + ec09bf7 commit c58a79d

341 files changed

Lines changed: 1865 additions & 67 deletions

File tree

Some content is hidden

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

‎python/phonenumbers/__init__.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@
7878
from .phonemetadata import REGION_CODE_FOR_NON_GEO_ENTITY, NumberFormat, PhoneNumberDesc, PhoneMetadata
7979
# Functionality
8080
from .asyoutypeformatter import AsYouTypeFormatter
81-
from .phonenumberutil import (COUNTRY_CODE_TO_REGION_CODE, SUPPORTED_REGIONS, UNKNOWN_REGION,
81+
from .phonenumberutil import (COUNTRY_CODE_TO_REGION_CODE, SUPPORTED_REGIONS, SUPPORTED_SHORT_REGIONS, UNKNOWN_REGION,
8282
MatchType, NumberParseException, PhoneNumberFormat,
8383
PhoneNumberType, ValidationResult,
8484
convert_alpha_characters_in_number,
@@ -114,7 +114,7 @@
114114
region_codes_for_country_code,
115115
region_code_for_number,
116116
truncate_too_long_number,)
117-
from .shortnumberutil import connects_to_emergency_number, is_emergency_number
117+
from .shortnumberutil import connects_to_emergency_number, is_emergency_number, ShortNumberCost
118118
from .phonenumbermatcher import PhoneNumberMatch, PhoneNumberMatcher, Leniency
119119

120120

@@ -230,7 +230,8 @@ def description_for_valid_number(*args, **kwargs):
230230
'REGION_CODE_FOR_NON_GEO_ENTITY', 'NumberFormat', 'PhoneNumberDesc', 'PhoneMetadata',
231231
'AsYouTypeFormatter',
232232
# items from phonenumberutil.py
233-
'COUNTRY_CODE_TO_REGION_CODE', 'SUPPORTED_REGIONS', 'UNKNOWN_REGION', 'NON_DIGITS_PATTERN',
233+
'COUNTRY_CODE_TO_REGION_CODE', 'SUPPORTED_REGIONS', 'SUPPORTED_SHORT_REGIONS',
234+
'UNKNOWN_REGION', 'NON_DIGITS_PATTERN',
234235
'MatchType', 'NumberParseException', 'PhoneNumberFormat',
235236
'PhoneNumberType', 'ValidationResult',
236237
'choose_formatting_pattern_for_number',
@@ -269,7 +270,7 @@ def description_for_valid_number(*args, **kwargs):
269270
'region_code_for_number',
270271
'truncate_too_long_number',
271272
# end of items from phonenumberutil.py
272-
'connects_to_emergency_number', 'is_emergency_number',
273+
'connects_to_emergency_number', 'is_emergency_number', 'ShortNumberCost',
273274
'PhoneNumberMatch', 'PhoneNumberMatcher', 'Leniency',
274275
'area_description_for_number',
275276
'country_name_for_number',

‎python/phonenumbers/data/__init__.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,20 @@
1515

1616
from ..phonemetadata import PhoneMetadata
1717

18-
_AVAILABLE_NONGEO_COUNTRY_CODES = [800, 808, 870, 878, 881, 882, 883, 888, 979]
1918
_AVAILABLE_REGION_CODES = ['AC','AD','AE','AF','AG','AI','AL','AM','AO','AR','AS','AT','AU','AW','AX','AZ','BA','BB','BD','BE','BF','BG','BH','BI','BJ','BL','BM','BN','BO','BQ','BR','BS','BT','BW','BY','BZ','CA','CC','CD','CF','CG','CH','CI','CK','CL','CM','CN','CO','CR','CU','CV','CW','CX','CY','CZ','DE','DJ','DK','DM','DO','DZ','EC','EE','EG','EH','ER','ES','ET','FI','FJ','FK','FM','FO','FR','GA','GB','GD','GE','GF','GG','GH','GI','GL','GM','GN','GP','GQ','GR','GT','GU','GW','GY','HK','HN','HR','HT','HU','ID','IE','IL','IM','IN','IO','IQ','IR','IS','IT','JE','JM','JO','JP','KE','KG','KH','KI','KM','KN','KP','KR','KW','KY','KZ','LA','LB','LC','LI','LK','LR','LS','LT','LU','LV','LY','MA','MC','MD','ME','MF','MG','MH','MK','ML','MM','MN','MO','MP','MQ','MR','MS','MT','MU','MV','MW','MX','MY','MZ','NA','NC','NE','NF','NG','NI','NL','NO','NP','NR','NU','NZ','OM','PA','PE','PF','PG','PH','PK','PL','PM','PR','PS','PT','PW','PY','QA','RE','RO','RS','RU','RW','SA','SB','SC','SD','SE','SG','SH','SI','SJ','SK','SL','SM','SN','SO','SR','SS','ST','SV','SX','SY','SZ','TA','TC','TD','TG','TH','TJ','TK','TL','TM','TN','TO','TR','TT','TV','TW','TZ','UA','UG','US','UY','UZ','VA','VC','VE','VG','VI','VN','VU','WF','WS','YE','YT','ZA','ZM','ZW']
19+
_AVAILABLE_NONGEO_COUNTRY_CODES = [800, 808, 870, 878, 881, 882, 883, 888, 979]
2020

2121
def _load_region(code):
2222
__import__("region_%s" % code, globals(), locals(),
2323
fromlist=["PHONE_METADATA_%s" % code], level=1)
2424

25-
for country_code in _AVAILABLE_NONGEO_COUNTRY_CODES:
26-
PhoneMetadata.register_nongeo_region_loader(country_code, _load_region)
27-
2825
for region_code in _AVAILABLE_REGION_CODES:
2926
PhoneMetadata.register_region_loader(region_code, _load_region)
3027

28+
29+
for country_code in _AVAILABLE_NONGEO_COUNTRY_CODES:
30+
PhoneMetadata.register_nongeo_region_loader(country_code, _load_region)
31+
3132
from .alt_format_34 import PHONE_ALT_FORMAT_34
3233
from .alt_format_351 import PHONE_ALT_FORMAT_351
3334
from .alt_format_380 import PHONE_ALT_FORMAT_380

‎python/phonenumbers/data/region_800.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
uan=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1515
emergency=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1616
voicemail=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
17+
short_code=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
18+
standard_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1719
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1820
number_format=[NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1 \\2')],
1921
leading_zero_possible=True)

‎python/phonenumbers/data/region_808.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
uan=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1515
emergency=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1616
voicemail=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
17+
short_code=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
18+
standard_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1719
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1820
number_format=[NumberFormat(pattern='(\\d{4})(\\d{4})', format='\\1 \\2')],
1921
leading_zero_possible=True)

‎python/phonenumbers/data/region_870.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
uan=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1515
emergency=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1616
voicemail=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
17+
short_code=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
18+
standard_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1719
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1820
number_format=[NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3')])

‎python/phonenumbers/data/region_878.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
uan=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1515
emergency=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1616
voicemail=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
17+
short_code=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
18+
standard_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1719
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1820
number_format=[NumberFormat(pattern='(\\d{2})(\\d{5})(\\d{5})', format='\\1 \\2 \\3')])

‎python/phonenumbers/data/region_881.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,7 @@
1414
uan=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1515
emergency=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1616
voicemail=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
17+
short_code=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
18+
standard_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1719
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1820
number_format=[NumberFormat(pattern='(\\d)(\\d{3})(\\d{5})', format='\\1 \\2 \\3', leading_digits_pattern=['[67]'])])

‎python/phonenumbers/data/region_882.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
uan=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1515
emergency=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1616
voicemail=PhoneNumberDesc(national_number_pattern='348[57]\\d{7}', possible_number_pattern='\\d{11}', example_number='3451234567'),
17+
short_code=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
18+
standard_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1719
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1820
number_format=[NumberFormat(pattern='(\\d{2})(\\d{4})(\\d{3})', format='\\1 \\2 \\3', leading_digits_pattern=['3[23]']),
1921
NumberFormat(pattern='(\\d{2})(\\d{5})', format='\\1 \\2', leading_digits_pattern=['16|342']),

‎python/phonenumbers/data/region_883.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
uan=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1515
emergency=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1616
voicemail=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
17+
short_code=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
18+
standard_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1719
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1820
number_format=[NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3'),
1921
NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{3})(\\d{3})', format='\\1 \\2 \\3 \\4')])

‎python/phonenumbers/data/region_888.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@
1414
uan=PhoneNumberDesc(national_number_pattern='\\d{11}', possible_number_pattern='\\d{11}', example_number='12345678901'),
1515
emergency=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1616
voicemail=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
17+
short_code=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
18+
standard_rate=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1719
no_international_dialling=PhoneNumberDesc(national_number_pattern='NA', possible_number_pattern='NA'),
1820
number_format=[NumberFormat(pattern='(\\d{3})(\\d{3})(\\d{5})', format='\\1 \\2 \\3')],
1921
leading_zero_possible=True)

0 commit comments

Comments
 (0)