Merge code changes from upstream 8.13.53

Author: daviddrysdale

python/phonenumbers/phonenumberutil.py

@@ -1686,10 +1686,13 @@ def format_out_of_country_keeping_alpha_chars(numobj, region_calling_from):
     region_code = region_code_for_country_code(country_code)
     # Metadata cannot be None because the country calling code is valid.
     metadata_for_region = PhoneMetadata.metadata_for_region_or_calling_code(country_code, region_code)
+    # Strip any extension
+    extension, stripped_number = _maybe_strip_extension(num_raw_input)
+    # Append the formatted extension
     formatted_number = _maybe_append_formatted_extension(numobj,
                                                          metadata_for_region,
                                                          PhoneNumberFormat.INTERNATIONAL,
-                                                         num_raw_input)
+                                                         stripped_number)
     if i18n_prefix_for_formatting:
         formatted_number = (i18n_prefix_for_formatting + U_SPACE +
                             unicod(country_code) + U_SPACE + formatted_number)
@@ -2449,6 +2452,7 @@ def _test_number_length(national_number, metadata, numtype=PhoneNumberType.UNKNO
 
 
 def is_possible_number_with_reason(numobj):
+    """See documentation for is_possible_number_for_type_with_reason"""
     return is_possible_number_for_type_with_reason(numobj, PhoneNumberType.UNKNOWN)
 
 
@@ -2477,6 +2481,14 @@ def is_possible_number_for_type_with_reason(numobj, numtype):
        area codes for fixed line numbers), it will return false for the
        subscriber-number-only version.
 
+    There is a known <a
+    href="https://issuetracker.google.com/issues/335892662">issue</a> with this
+    method: if a number is possible only in a certain region among several
+    regions that share the same country calling code, this method will consider
+    only the "main" region. For example, +1310xxxx are valid numbers in
+    Canada. However, they are not possible in the US. As a result, this method
+    will return IS_POSSIBLE_LOCAL_ONLY for +1310xxxx.
+
     Arguments:
     numobj -- The number object that needs to be checked
     numtype -- The type we are interested in

python/tests/phonenumberutiltest.py

@@ -620,6 +620,11 @@ def testFormatOutOfCountryKeepingAlphaChars(self):
         self.assertEqual("1 800 SIX-FLAG",
                          phonenumbers.format_out_of_country_keeping_alpha_chars(alphaNumericNumber, "BS"))
 
+        # Testing a number with extension.
+        alphaNumericNumberWithExtn = phonenumbers.parse("800 SIX-flag ext. 1234", "US", keep_raw_input=True)
+        self.assertEqual("0011 1 800 SIX-FLAG extn. 1234",
+                         phonenumbers.format_out_of_country_keeping_alpha_chars(alphaNumericNumberWithExtn, "AU"))
+
         # Testing that if the raw input doesn't exist, it is formatted using
         # formatOutOfCountryCallingNumber.
         alphaNumericNumber.raw_input = None