Skip to content

Commit da2dad4

Browse files
daviddrysdaledaviddrysdale
committed
Add & use PhoneMetadata.metadata_for_nongeo_region accessor
1 parent f3e62af commit da2dad4

3 files changed

Lines changed: 6 additions & 2 deletions

File tree

‎python/phonenumbers/asyoutypeformatter.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ def _attempt_to_extract_ccc(self):
532532
self._national_number = number_without_ccc
533533
new_region_code = region_code_for_country_code(country_code)
534534
if new_region_code == REGION_CODE_FOR_NON_GEO_ENTITY:
535-
self._current_metadata = PhoneMetadata.country_code_metadata[country_code]
535+
self._current_metadata = PhoneMetadata.metadata_for_nongeo_region(country_code)
536536
elif new_region_code != self._default_country:
537537
self._current_metadata = _get_metadata_for_region(new_region_code)
538538

‎python/phonenumbers/phonemetadata.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -220,6 +220,10 @@ class PhoneMetadata(UnicodeMixin, ImmutableMixin):
220220
def metadata_for_region(kls, region_code, default=None):
221221
return kls.region_metadata.get(region_code, default)
222222

223+
@classmethod
224+
def metadata_for_nongeo_region(kls, country_code, default=None):
225+
return kls.country_code_metadata.get(country_code, default)
226+
223227
@classmethod
224228
def metadata_for_region_or_calling_code(kls, country_calling_code, region_code):
225229
if region_code == REGION_CODE_FOR_NON_GEO_ENTITY:

‎python/phonenumbers/phonenumberutil.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1489,7 +1489,7 @@ def example_number_for_non_geo_entity(country_calling_code):
14891489
the metadata does not contain such information, or the country calling
14901490
code passed in does not belong to a non-geographical entity.
14911491
"""
1492-
metadata = PhoneMetadata.country_code_metadata.get(country_calling_code, None)
1492+
metadata = PhoneMetadata.metadata_for_nongeo_region(country_calling_code, None)
14931493
if metadata is not None:
14941494
desc = metadata.general_desc
14951495
try:

0 commit comments

Comments
 (0)