Skip to content

Commit a950af3

Browse files
daviddrysdaledaviddrysdale
committed
Sort missing exports
1 parent 019cf8b commit a950af3

9 files changed

Lines changed: 29 additions & 15 deletions

File tree

‎python/phonenumbers/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,7 @@
8484
convert_alpha_characters_in_number,
8585
country_code_for_region,
8686
country_code_for_valid_region,
87+
country_mobile_token,
8788
example_number,
8889
example_number_for_type,
8990
example_number_for_non_geo_entity,
@@ -145,6 +146,7 @@
145146
'convert_alpha_characters_in_number',
146147
'country_code_for_region',
147148
'country_code_for_valid_region',
149+
'country_mobile_token',
148150
'example_number',
149151
'example_number_for_type',
150152
'example_number_for_non_geo_entity',

‎python/phonenumbers/carrier.py‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
from .phonenumberutil import PhoneNumberType, number_type
3030
from .phonenumberutil import region_code_for_number
3131
from .phonenumberutil import is_mobile_number_portable_region
32-
from .prefix import prefix_description_for_number
32+
from .prefix import _prefix_description_for_number
3333
try:
3434
from .carrierdata import CARRIER_DATA, CARRIER_LONGEST_PREFIX
3535
except ImportError: # pragma no cover
@@ -47,6 +47,9 @@
4747
raise
4848

4949

50+
__all__ = ['name_for_valid_number', 'name_for_number', 'safe_display_name']
51+
52+
5053
def name_for_valid_number(numobj, lang, script=None, region=None):
5154
"""Returns a carrier name for the given PhoneNumber object, in the
5255
language provided.
@@ -72,8 +75,8 @@ def name_for_valid_number(numobj, lang, script=None, region=None):
7275
Returns a carrier name in the given language code, for the given phone
7376
number, or an empty string if no description is available.
7477
"""
75-
return prefix_description_for_number(CARRIER_DATA, CARRIER_LONGEST_PREFIX,
76-
numobj, lang, script, region)
78+
return _prefix_description_for_number(CARRIER_DATA, CARRIER_LONGEST_PREFIX,
79+
numobj, lang, script, region)
7780

7881

7982
def name_for_number(numobj, lang, script=None, region=None):

‎python/phonenumbers/geocoder.py‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
from .phonenumberutil import region_code_for_number, PhoneNumberType, PhoneNumber
4949
from .phonenumberutil import country_mobile_token, national_significant_number, number_type
5050
from .phonenumberutil import region_code_for_country_code, parse, NumberParseException
51-
from .prefix import prefix_description_for_number
51+
from .prefix import _prefix_description_for_number
5252
try:
5353
from .geodata import GEOCODE_DATA, GEOCODE_LONGEST_PREFIX
5454
from .geodata.locale import LOCALE_DATA
@@ -67,6 +67,8 @@
6767
else:
6868
raise
6969

70+
__all__ = ['country_name_for_number', 'description_for_valid_number', 'description_for_number']
71+
7072

7173
def country_name_for_number(numobj, lang, script=None, region=None):
7274
"""Return the given PhoneNumber object's country name in the given language.
@@ -155,11 +157,11 @@ def description_for_valid_number(numobj, lang, script=None, region=None):
155157
except NumberParseException:
156158
# If this happens, just re-use what we had.
157159
copied_numobj = numobj
158-
area_description = prefix_description_for_number(GEOCODE_DATA, GEOCODE_LONGEST_PREFIX,
159-
copied_numobj, lang, script, region)
160+
area_description = _prefix_description_for_number(GEOCODE_DATA, GEOCODE_LONGEST_PREFIX,
161+
copied_numobj, lang, script, region)
160162
else:
161-
area_description = prefix_description_for_number(GEOCODE_DATA, GEOCODE_LONGEST_PREFIX,
162-
numobj, lang, script, region)
163+
area_description = _prefix_description_for_number(GEOCODE_DATA, GEOCODE_LONGEST_PREFIX,
164+
numobj, lang, script, region)
163165
if area_description != "":
164166
return area_description
165167
else:

‎python/phonenumbers/prefix.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ def _find_lang(langdict, lang, script, region):
5656
return None
5757

5858

59-
def prefix_description_for_number(data, longest_prefix, numobj, lang, script=None, region=None):
59+
def _prefix_description_for_number(data, longest_prefix, numobj, lang, script=None, region=None):
6060
"""Return a text description of a PhoneNumber for the given language.
6161
6262
Arguments:

‎python/phonenumbers/timezone.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
from .util import prnt, u, U_PLUS
3838
from .phonenumberutil import PhoneNumberType, number_type
3939
from .phonenumberutil import PhoneNumberFormat, format_number
40-
from .prefix import prefix_description_for_number
4140
try:
4241
from .tzdata import TIMEZONE_DATA, TIMEZONE_LONGEST_PREFIX
4342
except ImportError: # pragma no cover
@@ -54,6 +53,8 @@
5453
else:
5554
raise
5655

56+
__all__ = ['UNKNOWN_TIMEZONE', 'time_zones_for_geographical_number', 'time_zones_for_number']
57+
5758
# This is defined by ICU as the unknown time zone.
5859
UNKNOWN_TIMEZONE = u("Etc/Unknown")
5960
_UNKNOWN_TIME_ZONE_LIST = (UNKNOWN_TIMEZONE,)

‎python/setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@
3939
author_email='dmd@lurklurk.org',
4040
url='https://github.com/daviddrysdale/python-phonenumbers',
4141
license='Apache License 2.0',
42-
packages=['phonenumbers', 'phonenumbers.data', 'phonenumbers.geodata', 'phonenumbers.shortdata',
42+
packages=['phonenumbers', 'phonenumbers.data', 'phonenumbers.geodata', 'phonenumbers.shortdata',
4343
'phonenumbers.carrierdata', 'phonenumbers.tzdata'],
4444
test_suite="tests",
4545
platforms='Posix; MacOS X; Windows',

‎python/tests/geocodertest.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from phonenumbers import geocoder
2424
from phonenumbers.geocoder import description_for_number, country_name_for_number
2525
from phonenumbers.geocoder import description_for_valid_number
26-
from phonenumbers.prefix import prefix_description_for_number
26+
from phonenumbers.prefix import _prefix_description_for_number
2727
from phonenumbers.util import u
2828

2929
# Allow override library geocoding metadata with the test metadata.
@@ -167,7 +167,7 @@ def testCoverage(self):
167167
invalid_number = PhoneNumber(country_code=210, national_number=123456)
168168
self.assertEqual("", country_name_for_number(invalid_number, "en"))
169169
# Ensure we exercise all public entrypoints directly
170-
self.assertEqual("CA", prefix_description_for_number(TEST_GEOCODE_DATA, TEST_GEOCODE_LONGEST_PREFIX, US_NUMBER1, "en"))
170+
self.assertEqual("CA", _prefix_description_for_number(TEST_GEOCODE_DATA, TEST_GEOCODE_LONGEST_PREFIX, US_NUMBER1, "en"))
171171
self.assertEqual("CA", description_for_valid_number(US_NUMBER1, "en"))
172172
self.assertEqual("", description_for_valid_number(US_INVALID_NUMBER, "en"))
173173
# Add in some script and region specific fictional names

‎setup.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
author_email='dmd@lurklurk.org',
4343
url='https://github.com/daviddrysdale/python-phonenumbers',
4444
license='Apache License 2.0',
45-
packages=['phonenumbers', 'phonenumbers.data', 'phonenumbers.geodata', 'phonenumbers.shortdata',
45+
packages=['phonenumbers', 'phonenumbers.data', 'phonenumbers.geodata', 'phonenumbers.shortdata',
4646
'phonenumbers.carrierdata', 'phonenumbers.tzdata'],
4747
package_dir={'': 'python'},
4848
test_suite="tests",

‎tools/python/allcheck.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,9 @@
77
sys.path.insert(0, '../../python')
88

99
import phonenumbers
10+
import phonenumbers.geocoder
11+
import phonenumbers.carrier
12+
import phonenumbers.timezone
1013

1114
# Manually grep for top-level identifiers
1215
INTERNAL_FILES = ['../../python/phonenumbers/util.py',
@@ -33,7 +36,10 @@
3336
grepped_all.add(m.group(1))
3437

3538
# Pull in the declared identifiers
36-
code_all = set(phonenumbers.__all__)
39+
code_all = (set(phonenumbers.__all__) |
40+
set(phonenumbers.geocoder.__all__) |
41+
set(phonenumbers.carrier.__all__) |
42+
set(phonenumbers.timezone.__all__))
3743

3844
# Compare
3945
code_not_grepped = (code_all - grepped_all)

0 commit comments

Comments
 (0)