Skip to content

Commit eb080ce

Browse files
daviddrysdaledaviddrysdale
committed
Merge upstream code changes for 7.7.5
1 parent 157841e commit eb080ce

2 files changed

Lines changed: 3 additions & 7 deletions

File tree

‎python/phonenumbers/phonenumberutil.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -859,7 +859,7 @@ def format_number(numobj, num_format):
859859
# leading '+' symbol (but the original number wasn't parseable
860860
# anyway).
861861
# TODO: Consider removing the 'if' above so that unparseable strings
862-
# without raw input format to the empty string instead of "+00"
862+
# without raw input format to the empty string instead of "+00".
863863
if len(numobj.raw_input) > 0:
864864
return numobj.raw_input
865865
country_calling_code = numobj.country_code
@@ -915,7 +915,7 @@ def format_by_pattern(numobj, number_format, user_defined_formats):
915915
# by only one region for performance reasons. For example, for NANPA
916916
# regions it will be contained in the metadata for US.
917917
region_code = region_code_for_country_code(country_code)
918-
# Metadata cannot be None because the country calling code is valid
918+
# Metadata cannot be None because the country calling code is valid.
919919
metadata = PhoneMetadata.metadata_for_region_or_calling_code(country_code, region_code)
920920

921921
formatted_number = U_EMPTY_STRING

‎python/tests/phonenumberutiltest.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,9 +107,7 @@ def testGetInstanceLoadUSMetadata(self):
107107
self.assertEqual("\\1 \\2 \\3", metadata.number_format[1].format)
108108
self.assertEqual("[13-689]\\d{9}|2[0-35-9]\\d{8}",
109109
metadata.general_desc.national_number_pattern)
110-
self.assertEqual("\\d{7}(?:\\d{3})?", metadata.general_desc.possible_number_pattern)
111110
self.assertEqual("[13-689]\\d{9}|2[0-35-9]\\d{8}", metadata.fixed_line.national_number_pattern)
112-
self.assertEqual("\\d{10}", metadata.toll_free.possible_number_pattern)
113111
self.assertEqual(1, len(metadata.general_desc.possible_length))
114112
self.assertEqual(10, metadata.general_desc.possible_length[0])
115113
# Python version: each number type description has its own possible_length value,
@@ -119,7 +117,6 @@ def testGetInstanceLoadUSMetadata(self):
119117
self.assertEqual("900\\d{7}", metadata.premium_rate.national_number_pattern)
120118
# No shared-cost data is available, so it should be initialised to None.
121119
self.assertEqual(None, metadata.shared_cost.national_number_pattern)
122-
self.assertEqual(None, metadata.shared_cost.possible_number_pattern)
123120

124121
def testGetInstanceLoadDEMetadata(self):
125122
metadata = PhoneMetadata.metadata_for_region("DE")
@@ -141,9 +138,8 @@ def testGetInstanceLoadDEMetadata(self):
141138
self.assertEqual(2, len(metadata.mobile.possible_length))
142139
self.assertEqual("(?:[24-6]\\d{2}|3[03-9]\\d|[789](?:0[2-9]|[1-9]\\d))\\d{1,8}",
143140
metadata.fixed_line.national_number_pattern)
144-
self.assertEqual("\\d{2,14}", metadata.fixed_line.possible_number_pattern)
145141
self.assertEqual("30123456", metadata.fixed_line.example_number)
146-
self.assertEqual("\\d{10}", metadata.toll_free.possible_number_pattern)
142+
self.assertEqual(10, metadata.toll_free.possible_length[0])
147143
self.assertEqual("900([135]\\d{6}|9\\d{7})", metadata.premium_rate.national_number_pattern)
148144

149145
def testGetInstanceLoadARMetadata(self):

0 commit comments

Comments
 (0)