Merge pull request #26 from maxmind/greg/deprecate-anon-proxy

Deprecate is_anonymous_proxy and is_satellite_provider
maxmind · Jun 26, 2015 · 4fda81a · 4fda81a
2 parents 90b205a + 5d066ad
commit 4fda81a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/HISTORY.rst b/HISTORY.rst
@@ -9,6 +9,12 @@ History
 * The ``geoip2.records.Location` class has been updated to add attributes for
   the ``average_income`` and ``population_density`` fields provided by the
   Insights web service.
+* The ``is_anonymous_proxy`` and ``is_satellite_provider`` properties on
+  ``geoip2.records.Traits`` have been deprecated. Please use our `GeoIP2
+  Anonymous IP database
+  <https://www.maxmind.com/en/geoip2-anonymous-ip-database>`_
+  to determine whether an IP address is used by an anonymizing service.
+
 
 2.1.0 (2014-12-09)
 ++++++++++++++++++

diff --git a/geoip2/database.py b/geoip2/database.py
@@ -23,9 +23,6 @@ class Reader(object):
     Instances of this class provide a reader for the GeoIP2 database format.
     IP addresses can be looked up using the ``country`` and ``city`` methods.
 
-     Usage
-     -----
-
     The basic API for this class is the same for every database. First, you
     create a reader object, specifying a file name. You then call the method
     corresponding to the specific database, passing it the IP address you want

diff --git a/geoip2/records.py b/geoip2/records.py
@@ -500,13 +500,23 @@ class Traits(Record):
 
       :type: bool
 
+      .. deprecated:: 2.2.0
+        Use our our `GeoIP2 Anonymous IP database
+        <https://www.maxmind.com/en/geoip2-anonymous-ip-database GeoIP2>`_
+        instead.
+
     .. attribute:: is_satellite_provider
 
       This is true if the IP address is from a satellite provider that
       provides service to multiple countries.
 
       :type: bool
 
+      .. deprecated:: 2.2.0
+        Use our our `GeoIP2 Anonymous IP database
+        <https://www.maxmind.com/en/geoip2-anonymous-ip-database GeoIP2>`_
+        instead.
+
     .. attribute:: isp
 
       The name of the ISP associated with the IP address. This attribute is