test0908
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed #30447 -- Added 'is_in_european_union' in GeoIP2.city() dict.

This commit is contained in:
Chris Adkins 2019-05-07 21:31:44 +10:00 committed by Mariusz Felisiak
parent 59de9494e7
commit 705ef6cfeb
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,6 +6,7 @@ def City(response):
'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,
'is_in_european_union': response.country.is_in_european_union,
'latitude': response.location.latitude, 'latitude': response.location.latitude,
'longitude': response.location.longitude, 'longitude': response.location.longitude,
'postal_code': response.postal.code, 'postal_code': response.postal.code,

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

@ -38,6 +38,7 @@ Here is an example of its usage::
'country_code': 'US', 'country_code': 'US',
'country_name': 'United States', 'country_name': 'United States',
'dma_code': 807, 'dma_code': 807,
'is_in_european_union': False,
'latitude': 37.419200897216797, 'latitude': 37.419200897216797,
'longitude': -122.05740356445312, 'longitude': -122.05740356445312,
'postal_code': '94043', 'postal_code': '94043',

1
tests/gis_tests/test_geoip2.py
View File

@ -127,6 +127,7 @@ class GeoIPTest(SimpleTestCase):
self.assertEqual('Houston', d['city']) self.assertEqual('Houston', d['city'])
self.assertEqual('TX', d['region']) self.assertEqual('TX', d['region'])
self.assertEqual('America/Chicago', d['time_zone']) self.assertEqual('America/Chicago', d['time_zone'])
self.assertFalse(d['is_in_european_union'])
geom = g.geos(query) geom = g.geos(query)
self.assertIsInstance(geom, GEOSGeometry) self.assertIsInstance(geom, GEOSGeometry)