diff options
| author | Chris Adkins <c23gooey@gmail.com> | 2019-05-07 21:31:44 +1000 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2019-05-07 13:31:44 +0200 |
| commit | 705ef6cfebe000df1971e25ee269c2e26bac18f4 (patch) | |
| tree | 09a6c6225f12d073b1ad9eb9fa6688b854727d08 | |
| parent | 59de9494e7513de29bc71bd0b27445daff25a4b3 (diff) | |
Fixed #30447 -- Added 'is_in_european_union' in GeoIP2.city() dict.
| -rw-r--r-- | django/contrib/gis/geoip2/resources.py | 1 | ||||
| -rw-r--r-- | docs/ref/contrib/gis/geoip2.txt | 1 | ||||
| -rw-r--r-- | tests/gis_tests/test_geoip2.py | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/django/contrib/gis/geoip2/resources.py b/django/contrib/gis/geoip2/resources.py index 3de3346194..08923b0998 100644 --- a/django/contrib/gis/geoip2/resources.py +++ b/django/contrib/gis/geoip2/resources.py @@ -6,6 +6,7 @@ def City(response): 'country_code': response.country.iso_code, 'country_name': response.country.name, 'dma_code': response.location.metro_code, + 'is_in_european_union': response.country.is_in_european_union, 'latitude': response.location.latitude, 'longitude': response.location.longitude, 'postal_code': response.postal.code, diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt index 91e2c793b1..2dc3dff526 100644 --- a/docs/ref/contrib/gis/geoip2.txt +++ b/docs/ref/contrib/gis/geoip2.txt @@ -38,6 +38,7 @@ Here is an example of its usage:: 'country_code': 'US', 'country_name': 'United States', 'dma_code': 807, + 'is_in_european_union': False, 'latitude': 37.419200897216797, 'longitude': -122.05740356445312, 'postal_code': '94043', diff --git a/tests/gis_tests/test_geoip2.py b/tests/gis_tests/test_geoip2.py index 9813f384ed..6993db3c76 100644 --- a/tests/gis_tests/test_geoip2.py +++ b/tests/gis_tests/test_geoip2.py @@ -127,6 +127,7 @@ class GeoIPTest(SimpleTestCase): self.assertEqual('Houston', d['city']) self.assertEqual('TX', d['region']) self.assertEqual('America/Chicago', d['time_zone']) + self.assertFalse(d['is_in_european_union']) geom = g.geos(query) self.assertIsInstance(geom, GEOSGeometry) |