Skip to content

Commit 6c4155f

Browse files
daviddrysdaledaviddrysdale
committed
Merge upstream r419
1 parent cc0bf04 commit 6c4155f

2 files changed

Lines changed: 5 additions & 2 deletions

File tree

‎python/HISTORY‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
What's new in 4.5b1
44
=====================
55

6-
Merge up to upstream Subversion revision 415.
6+
Merge up to upstream Subversion revision 419.
77

88

99
=====================

‎python/tests/geocodertest.py‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919

2020
import unittest
2121

22-
from phonenumbers import PhoneNumber
22+
from phonenumbers import PhoneNumber, FrozenPhoneNumber
2323
from phonenumbers import geocoder
2424

2525
# Allow override library geocoding metadata with the test metadata.
@@ -54,6 +54,7 @@ def insert_test_geodata():
5454
BS_NUMBER1 = PhoneNumber(country_code=1, national_number=2423651234L)
5555
AU_NUMBER = PhoneNumber(country_code=61, national_number=236618300L)
5656
NUMBER_WITH_INVALID_COUNTRY_CODE = PhoneNumber(country_code=999, national_number=2423651234L)
57+
INTERNATIONAL_TOLL_FREE = FrozenPhoneNumber(country_code=800, national_number=12345678L)
5758

5859
# Language/country codes
5960
_CHINA = "CN"
@@ -87,6 +88,8 @@ def testGetDescriptionForNumberWithNoDataFile(self):
8788
geocoder.description_for_number(AU_NUMBER, _ENGLISH, region=_USA))
8889
self.assertEqual("",
8990
geocoder.description_for_number(NUMBER_WITH_INVALID_COUNTRY_CODE, _ENGLISH, region=_USA))
91+
self.assertEqual("",
92+
geocoder.description_for_number(INTERNATIONAL_TOLL_FREE, _ENGLISH, region=_USA))
9093

9194
def testGetDescriptionForNumberWithMissingPrefix(self):
9295
# Test that the name of the country is returned when the number passed in

0 commit comments

Comments
 (0)