Fst 20230613

.github/workflows/ci.yml

@@ -6,15 +6,15 @@ permissions:
 jobs:
   build:
 
-    runs-on: ubuntu-18.04
+    runs-on: ubuntu-20.04
     strategy:
       matrix:
-        python-version: [2.7, 3.3, 3.4, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", pypy2, pypy3]
+        python-version: [2.7, 3.5, 3.6, 3.7, 3.8, 3.9, "3.10", 3.11, pypy2.7, pypy3.9]
 
     steps:
-    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
     - name: Set up Python ${{ matrix.python-version }}
-      uses: actions/setup-python@f38219332975fe8f9c04cca981d674bf22aea1d3 # v2
+      uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
       with:
         python-version: ${{ matrix.python-version }}
     - name: Install dependencies

.github/workflows/coverage.yml

@@ -8,15 +8,15 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@629c2de402a417ea7690ca6ce3f33229e27606a5 # v2
+    - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c # v3
     - name: Set up latest Python 3
-      uses: actions/setup-python@f38219332975fe8f9c04cca981d674bf22aea1d3 # v2
+      uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
       with:
         python-version: 3
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install protobuf pycodestyle coverage coveralls
+        pip install protobuf==3.17.3 pycodestyle coverage coveralls
     - name: Test with coverage
       run: |
         cd python

.github/workflows/typing.yml

@@ -18,7 +18,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install mypy==0.921 types-protobuf
+          pip install mypy==0.921 types-protobuf==3.19.21
 
       - name: Execute run_stubtest.py
         run: |
@@ -39,7 +39,7 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install mypy types-protobuf
+          pip install mypy==0.921 types-protobuf==3.19.21
 
       - name: Run mypy
         run: |

python/HISTORY.md

@@ -12,6 +12,24 @@ This file does not generally include descriptions of patch releases (vX.Y.Z
 changes.  (Metadata updates are best checked
 [upstream](https://github.com/google/libphonenumber/blob/master/release_notes.txt).)
 
+What's new in 8.13.8
+--------------------
+
+Merge to
+[upstream commit 07cd7bbb8a2f](https://github.com/google/libphonenumber/commit/07cd7bbb8a2f);
+relevant code changes:
+
+- Added a check to phonenumberutil.py that the value of the `phone-context` parameter of the tel URI follows the correct
+  syntax as defined in [RFC3966](https://www.rfc-editor.org/rfc/rfc3966#section-3).
+
+What's new in 8.13.0
+--------------------
+
+Merge to [upstream commit
+185004cabd1bb4d3](https://github.com/google/libphonenumber/commit/185004cabd1bb4d3).  Upstream has
+removed the `leading_zero_possible` field from the `PhoneMetadata` type as part of this version;
+however, this change is *not* mirrored in the Python code due to back-compatibility concerns.
+
 What's new in 8.12.40
 ---------------------
 

python/appspot.py

@@ -0,0 +1,129 @@
+#!/usr/bin/env python
+"""
+Script for comparison with https://phonenumber.appspot.com
+"""
+import getopt
+import phonenumbers
+import phonenumbers.carrier
+import phonenumbers.geocoder
+import phonenumbers.timezone
+from phonenumbers import PhoneNumberFormat
+import sys
+import urllib.parse
+
+def interactive_query():
+    number = prompt("Specify a Phone Number: ")
+    country = prompt_or_default("Specify a Default Country: ", None)
+    locale = prompt_or_default("Specify a locale for phone number geocoding: ", "en")
+    return (number, country, locale)
+
+def prompt(msg):
+    result = input(msg)
+    return result.strip()
+
+def prompt_or_default(msg, default):
+    result = prompt(msg)
+    if not result:
+        return default
+    else:
+        return result
+
+
+def blank_if_none(val):
+    if val is None:
+        return ""
+    else:
+        return val
+
+def appspot(number, country, locale):
+    print("\n\nPhone Number entered: %s" % number)
+    print("Default country entered: %s" % country)
+    print("Language entered: %s" % locale)
+    country = "ZZ" if country is None else country
+
+    numobj = phonenumbers.parse(number, country, keep_raw_input=True)
+    print("\nParsing result (parse(keep_raw_input=True))")
+    print("country_code                   : %s" % blank_if_none(numobj.country_code))
+    print("national_number                : %s" % blank_if_none(numobj.national_number))
+    print("extension                      : %s" % blank_if_none(numobj.extension))
+    print("country_code_source            : %s" % blank_if_none(phonenumbers.CountryCodeSource.to_string(numobj.country_code_source)))
+    print("italian_leading_zero           : %s" % blank_if_none(numobj.italian_leading_zero))
+    print("number_of_leading_zeros        : %s" % blank_if_none(numobj.number_of_leading_zeros))
+    print("raw_input                      : %s" % blank_if_none(numobj.raw_input))
+    print("preferred_domestic_carrier_code: %s" % blank_if_none(numobj.preferred_domestic_carrier_code))
+
+    valid = phonenumbers.is_valid_number(numobj)
+    print("\nValidation Results")
+    print("Result from isPossibleNumber()      : %s" % phonenumbers.is_possible_number(numobj))
+    print("Result from isValidNumber()         : %s" % valid)
+    if valid and country != "ZZ":
+        print("Result from isValidNumberForRegion(): %s" % phonenumbers.is_valid_number_for_region(numobj, country))
+    print("Phone Number region                 : %s" % phonenumbers.region_code_for_number(numobj))
+    print("Result from getNumberType()         : %s" % phonenumbers.PhoneNumberType.to_string(phonenumbers.number_type(numobj)))
+
+
+    print("\nFormatting Results")
+    print("E164 format                                            : %s" % (phonenumbers.format_number(numobj, PhoneNumberFormat.E164) if valid else "invalid"))
+    print("Original format                                        : %s" % phonenumbers.format_in_original_format(numobj, country))
+    print("National format                                        : %s" % phonenumbers.format_number(numobj, PhoneNumberFormat.NATIONAL))
+    print("International format                                   : %s" % (phonenumbers.format_number(numobj, PhoneNumberFormat.INTERNATIONAL) if valid else "invalid"))
+    print("Out-of-country format from US                          : %s" % (phonenumbers.format_out_of_country_calling_number(numobj, "US") if valid else "invalid"))
+    print("Out-of-country format from CH                          : %s" % (phonenumbers.format_out_of_country_calling_number(numobj, "CH") if valid else "invalid"))
+    print("Format number for mobile dialing (calling from US)     : %s" % (phonenumbers.format_number_for_mobile_dialing(numobj, "US", True) if valid else "invalid"))
+    print("Format for national dialing with preferred carrier code: %s" % (phonenumbers.format_national_number_with_carrier_code(numobj, "") if valid else "invalid"))
+    print("   and empty fallback carrier code")
+
+
+    print("\nAsYouTypeFormatter Results")
+    formatter = phonenumbers.AsYouTypeFormatter(country)
+    for i in range(len(number)):
+        input_char = number[i]
+        print("Char entered '%s' Output: %s" % (input_char, formatter.input_digit(input_char)))
+
+    if valid:
+        print("\nPhoneNumberOfflineGeocoder Results")
+        print("Location: %s" % phonenumbers.geocoder.description_for_number(numobj, locale))
+
+        print("\nPhoneNumberToTimeZonesMapper Results")
+        print("Time zone(s): [%s]" % ", ".join(phonenumbers.timezone.time_zones_for_number(numobj)))
+
+        print("\nPhoneNumberToCarrierMapper Results")
+        print("Carrier: %s" % phonenumbers.carrier.name_for_number(numobj, locale))
+
+    print("\nPython library version: %s" % phonenumbers.__version__)
+    print("\nCompare with: https://libphonenumber.appspot.com/phonenumberparser?number=%s&country=%s" % (urllib.parse.quote_plus(number), country))
+
+
+def usage():
+    print("./appspot.py [opts]")
+    print("  --number <val>  / -n <val>  : number to parse")
+    print("  --country <val> / -c <val>  : default country for parsing (default None)")
+    print("  --locale <val>  / -l <val>  : language (default None)")
+    print("  --help          / -h        : show this message")
+
+
+if __name__ == '__main__':
+    number = None
+    country = None
+    locale = None
+    try:
+        opts, args = getopt.getopt(sys.argv[1:], "hn:c:l:", ["help", "number=", "country=", "locale="])
+    except getopt.GetoptError as err:
+        print(err)  # will print something like "option -a not recognized"
+        usage()
+        sys.exit(2)
+    for o, a in opts:
+        if o in ("-h", "--help"):
+            usage()
+            sys.exit()
+        elif o in ("-n", "--number"):
+            number = a
+        elif o in ("-c", "--country"):
+            country = a
+        elif o in ("-l", "--locale"):
+            locale = a
+        else:
+            assert False, "unhandled option"
+    if number is None:
+        (number, country, locale) = interactive_query()
+    appspot(number, country, locale)

python/dialpad_tests.py

@@ -0,0 +1,78 @@
+import phonenumbers
+
+# Fixed by Phonenumbers Cases
+valid_strings = ['+442083661177',
+                 '+658003211137',
+                 '+20573925008',
+                 '+2057392500',
+                 '+20225777444',
+                 '+84384813220',
+                 '+84357659677',
+                 '+56232512653',  # https://switchcomm.atlassian.net/browse/TEL-9285
+                 '+525547808256',
+                 '+13677395285',
+                 '+16892226575',
+                 '+18404440531',
+                 '+48477314848',
+                 '+6569786318',
+                 '+6560115374',  # https://switchcomm.atlassian.net/browse/TEL-14616
+                 '+576015088865',  # https://switchcomm.atlassian.net/browse/TEL-14616
+                 '+16562013774', # https://dialpad.atlassian.net/browse/DP-60739
+                 '+18352010583', # https://dialpad.atlassian.net/browse/DP-67544
+                 '+15572003655', # https://dialpad.atlassian.net/browse/DP-67544
+                 '+61493772332', # https://dialpad.atlassian.net/browse/DP-73324
+                 ]
+
+print ('######### - VALID BY LIBRARY - ################')
+for l in valid_strings:
+  x = phonenumbers.parse(l, None)
+  print ('%15s' % l, '%10s' % phonenumbers.is_valid_number(x), '%25s' % x)
+
+# To be fixed by Dialpad Changes
+dialpad_cases = ['+6278033212174',  # https://switchcomm.atlassian.net/browse/DP-13742
+                 '+63283168971',    # Philipines
+                 '+8031000000141',  # Dialpadistan
+                 '+2250757715034',  # Ivory Coast - New Format
+                 '+2252721214601',  # Ivory Coast - New Format
+                 ]
+
+print ('######### - VALID BY DIALPAD - ################')
+for l in dialpad_cases:
+  try:
+    x = phonenumbers.parse(l, None)
+    print ('%15s' % l, '%10s' % phonenumbers.is_valid_number(x), '%25s' % x)
+  except Exception as e:
+    print ('%15s' % l, '%25s' % e)
+
+# Invalid Strings
+invalid_strings = ['+4916190899790',  # https://switchcomm.atlassian.net/browse/TEL-8824  Not Fixed
+                   '+2022577744',
+                   '+205739250',
+                   ]
+
+print ('######### - INVALID NUMBERS - ################')
+for l in invalid_strings:
+  x = phonenumbers.parse(l, None)
+  print ('%15s' % l, '%10s' % phonenumbers.is_valid_number(x), '%25s' % x)
+
+# National Format match
+national_format_match = {'+525547808256': '55 4780 8256'}
+
+print ('######### - NUMBER FORMAT VALIDITY - ################')
+for l in national_format_match:
+  x = phonenumbers.parse(l, None)
+  y = phonenumbers.format_number(x, phonenumbers.PhoneNumberFormat.NATIONAL)
+  if national_format_match[l] == y:
+    status = 'Success'
+  else:
+    status = 'Failed'
+  print (l), '-> %10s : %s' % (y, status)
+
+# Number validity check
+number_validity_check = {'1932621160': 'BR'}
+print ('######### - REGION NUMBER VALIDITY - ###############')
+for l in number_validity_check:
+  region = number_validity_check[l]
+  x = phonenumbers.parse(l, region)
+  print ('%15s' % l, '%10s -> Region : %5s' % (phonenumbers.is_valid_number(x), region))
+

python/phonenumbers/__init__.py

@@ -146,7 +146,7 @@
 
 # Version number is taken from the upstream libphonenumber version
 # together with an indication of the version of the Python-specific code.
-__version__ = "8.12.43"
+__version__ = "8.13.14"
 
 __all__ = ['PhoneNumber', 'CountryCodeSource', 'FrozenPhoneNumber',
            'REGION_CODE_FOR_NON_GEO_ENTITY', 'NumberFormat', 'PhoneNumberDesc', 'PhoneMetadata',

python/phonenumbers/asyoutypeformatter.py

@@ -89,7 +89,7 @@ def __init__(self, region_code):
         Arguments:
         region_code -- The region where the phone number is being entered
 
-        Return an AsYouTypeFormatter} object, which could be used to format
+        Return an AsYouTypeFormatter object, which could be used to format
         phone numbers in the specific region "as you type"
         """
         self._clear()

python/phonenumbers/carrierdata/__init__.py

@@ -4,7 +4,7 @@
 """
 from ..util import u
 
-# Copyright (C) 2011-2022 The Libphonenumber Authors
+# Copyright (C) 2011-2023 The Libphonenumber Authors
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.