From 502f03d8970f94c0155b04e34532277523c08d9a Mon Sep 17 00:00:00 2001
From: R3turnz <r3turnz@googlemail.com>
Date: Tue, 23 May 2017 03:07:14 +0200
Subject: [PATCH] Fixed #28112 -- Added 'time_zone' in GeoIP2.city() dict.

---
 django/contrib/gis/geoip2/resources.py | 1 +
 docs/ref/contrib/gis/geoip2.txt        | 3 ++-
 tests/gis_tests/test_geoip2.py         | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/django/contrib/gis/geoip2/resources.py b/django/contrib/gis/geoip2/resources.py
index 327b60049ae..967fe0a5a9c 100644
--- a/django/contrib/gis/geoip2/resources.py
+++ b/django/contrib/gis/geoip2/resources.py
@@ -8,6 +8,7 @@ def City(response):
         'longitude': response.location.longitude,
         'postal_code': response.postal.code,
         'region': response.subdivisions[0].iso_code if len(response.subdivisions) else None,
+        'time_zone': response.location.time_zone,
     }
 
 
diff --git a/docs/ref/contrib/gis/geoip2.txt b/docs/ref/contrib/gis/geoip2.txt
index 3870556260e..c533cf6e47a 100644
--- a/docs/ref/contrib/gis/geoip2.txt
+++ b/docs/ref/contrib/gis/geoip2.txt
@@ -39,7 +39,8 @@ Here is an example of its usage::
     'latitude': 37.419200897216797,
     'longitude': -122.05740356445312,
     'postal_code': '94043',
-    'region': 'CA'}
+    'region': 'CA',
+    'time_zone': 'America/Los_Angeles'}
     >>> g.lat_lon('salon.com')
     (39.0437, -77.4875)
     >>> g.lon_lat('uh.edu')
diff --git a/tests/gis_tests/test_geoip2.py b/tests/gis_tests/test_geoip2.py
index 3d3677f36b0..f28f8da1e16 100644
--- a/tests/gis_tests/test_geoip2.py
+++ b/tests/gis_tests/test_geoip2.py
@@ -118,6 +118,7 @@ class GeoIPTest(unittest.TestCase):
             self.assertEqual('US', d['country_code'])
             self.assertEqual('Houston', d['city'])
             self.assertEqual('TX', d['region'])
+            self.assertEqual('America/Chicago', d['time_zone'])
 
             geom = g.geos(query)
             self.assertIsInstance(geom, GEOSGeometry)