Skip to content

Commit 8964b75

Browse files
daviddrysdaledaviddrysdale
committed
Merge upstream code change from r353
1 parent 6d03cf7 commit 8964b75

2 files changed

Lines changed: 8 additions & 1 deletion

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 3.9b1
44
=====================
55

6-
Merge up to upstream Subversion revision 350.
6+
Merge up to upstream Subversion revision 353.
77

88

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

‎python/tests/geocodertest.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ def insert_test_geodata():
5252
US_NUMBER1 = PhoneNumber(country_code=1, national_number=6502530000L)
5353
US_NUMBER2 = PhoneNumber(country_code=1, national_number=6509600000L)
5454
US_NUMBER3 = PhoneNumber(country_code=1, national_number=2128120000L)
55+
US_NUMBER4 = PhoneNumber(country_code=1, national_number=6174240000L)
5556
US_INVALID_NUMBER = PhoneNumber(country_code=1, national_number=123456789L)
5657
BS_NUMBER1 = PhoneNumber(country_code=1, national_number=2423651234L)
5758
AU_NUMBER = PhoneNumber(country_code=61, national_number=236618300L)
@@ -89,6 +90,12 @@ def testGetDescriptionForNumberWithNoDataFile(self):
8990
self.assertEquals("",
9091
geocoder.description_for_number(NUMBER_WITH_INVALID_COUNTRY_CODE, _ENGLISH, region=_USA))
9192

93+
def testGetDescriptionForNumberWithMissingPrefix(self):
94+
# Test that the name of the country is returned when the number passed in
95+
# is valid but not covered by the geocoding data file.
96+
self.assertEquals("United States",
97+
geocoder.description_for_number(US_NUMBER4, _ENGLISH, region=_USA))
98+
9299
def testGetDescriptionForNumber_en_US(self):
93100
self.assertEquals("CA",
94101
geocoder.description_for_number(US_NUMBER1, _ENGLISH, region=_USA))

0 commit comments

Comments
 (0)