Update docs/test for accuracy radius in City

Author: oschwald

HISTORY.rst

@@ -3,6 +3,12 @@
 History
 -------
 
+2.3.1 (2016-XX-XX)
+++++++++++++++++++
+
+* Updated documentation to reflect that the accuracy radius is now included
+  in City.
+
 2.3.0 (2016-04-15)
 ++++++++++++++++++
 

geoip2/records.py

@@ -251,35 +251,31 @@ class Location(Record):
 
     .. attribute:: average_income
 
-      The average income in US dollars associated with the requested IP address
-      This attribute is only available from the Insights end point.
+      The average income in US dollars associated with the requested IP
+      address. This attribute is only available from the Insights end point.
 
       :type: int
 
     .. attribute:: accuracy_radius
 
-      The radius in kilometers around the
-      specified location where the IP address is likely to be. This attribute
-      is only available from the Insights end point and the GeoIP2 Enterprise
-      database.
+      The radius in kilometers around the specified location where the IP
+      address is likely to be.
 
       :type: int
 
     .. attribute:: latitude
 
       The approximate latitude of the location associated with the IP
       address. This value is not precise and should not be used to identify a
-      particular address or household. This attribute is returned by all end
-      points and location databases except Country.
+      particular address or household.
 
       :type: float
 
     .. attribute:: longitude
 
       The approximate longitude of the location associated with the IP
       address. This value is not precise and should not be used to identify a
-      particular address or household. This attribute is returned by all end
-      points and location databases except Country.
+      particular address or household.
 
       :type: float
 
@@ -301,9 +297,9 @@ class Location(Record):
 
     .. attribute:: time_zone
 
-      The time zone associated with location, as
-      specified by the `IANA Time Zone Database
-      <http://www.iana.org/time-zones>`_, e.g., "America/New_York".
+      The time zone associated with location, as specified by the `IANA Time
+      Zone Database <http://www.iana.org/time-zones>`_, e.g.,
+      "America/New_York".
 
       :type: unicode
 

requirements.txt

@@ -1,2 +1,2 @@
-requests>=2.4
-maxminddb>=1.1.0
+requests>=2.9
+maxminddb>=1.2.0

tests/data

@@ -26,14 +26,6 @@
 
 class BaseTestReader(object):
 
-    def test_default_locale(self):
-        reader = geoip2.database.Reader(
-            'tests/data/test-data/GeoIP2-City-Test.mmdb')
-        record = reader.city('81.2.69.160')
-
-        self.assertEqual(record.country.name, 'United Kingdom')
-        reader.close()
-
     def test_language_list(self):
         reader = geoip2.database.Reader(
             'tests/data/test-data/GeoIP2-Country-Test.mmdb',
@@ -43,13 +35,6 @@ def test_language_list(self):
         self.assertEqual(record.country.name, 'Великобритания')
         reader.close()
 
-    def test_has_ip_address(self):
-        reader = geoip2.database.Reader(
-            'tests/data/test-data/GeoIP2-Country-Test.mmdb')
-        record = reader.country('81.2.69.160')
-        self.assertEqual(record.traits.ip_address, '81.2.69.160')
-        reader.close()
-
     def test_unknown_address(self):
         reader = geoip2.database.Reader(
             'tests/data/test-data/GeoIP2-City-Test.mmdb')
@@ -91,6 +76,18 @@ def test_anonymous_ip(self):
         self.assertEqual(record.ip_address, ip_address)
         reader.close()
 
+    def test_city(self):
+        reader = geoip2.database.Reader(
+            'tests/data/test-data/GeoIP2-City-Test.mmdb')
+        record = reader.city('81.2.69.160')
+
+        self.assertEqual(record.country.name, 'United Kingdom',
+                         'The default locale is en')
+
+        self.assertEqual(record.location.accuracy_radius, 100,
+                         'The accuracy_radius is populated')
+        reader.close()
+
     def test_connection_type(self):
         reader = geoip2.database.Reader(
             'tests/data/test-data/GeoIP2-Connection-Type-Test.mmdb')
@@ -109,6 +106,14 @@ def test_connection_type(self):
 
         reader.close()
 
+    def test_country(self):
+        reader = geoip2.database.Reader(
+            'tests/data/test-data/GeoIP2-Country-Test.mmdb')
+        record = reader.country('81.2.69.160')
+        self.assertEqual(record.traits.ip_address, '81.2.69.160',
+                         'IP address is added to model')
+        reader.close()
+
     def test_domain(self):
         reader = geoip2.database.Reader(
             'tests/data/test-data/GeoIP2-Domain-Test.mmdb')