innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #28740 -- Added 'continent_code' and 'continent_name' in GeoIP2.city() dict.

This commit is contained in:
Ryan Verner 2017-10-25 19:30:42 +11:00 committed by Tim Graham
parent d1317edad0
commit 9473a8481a
3 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/contrib/gis/geoip2/resources.py
View File

@ -1,6 +1,8 @@
def City(response): def City(response):
return { return {
'city': response.city.name, 'city': response.city.name,
'continent_code': response.continent.code,
'continent_name': response.continent.name,
'country_code': response.country.iso_code, 'country_code': response.country.iso_code,
'country_name': response.country.name, 'country_name': response.country.name,
'dma_code': response.location.metro_code, 'dma_code': response.location.metro_code,

2
docs/ref/contrib/gis/geoip2.txt
View File

@ -33,6 +33,8 @@ Here is an example of its usage::
{'country_code': 'US', 'country_name': 'United States'} {'country_code': 'US', 'country_name': 'United States'}
>>> g.city('72.14.207.99') >>> g.city('72.14.207.99')
{'city': 'Mountain View', {'city': 'Mountain View',
'continent_code': 'NA',
'continent_name': 'North America',
'country_code': 'US', 'country_code': 'US',
'country_name': 'United States', 'country_name': 'United States',
'dma_code': 807, 'dma_code': 807,

2
tests/gis_tests/test_geoip2.py
View File

@ -115,6 +115,8 @@ class GeoIPTest(unittest.TestCase):
# City information dictionary. # City information dictionary.
d = g.city(query) d = g.city(query)
self.assertEqual('NA', d['continent_code'])
self.assertEqual('North America', d['continent_name'])
self.assertEqual('US', d['country_code']) self.assertEqual('US', d['country_code'])
self.assertEqual('Houston', d['city']) self.assertEqual('Houston', d['city'])
self.assertEqual('TX', d['region']) self.assertEqual('TX', d['region'])