Merge pull request #125 from maxmind/greg/product-renaming

Update service names

Author: horgh

.gitmodules

@@ -1,3 +1,3 @@
 [submodule "tests/data"]
 	path = tests/data
-	url = git://github.com/maxmind/MaxMind-DB.git
+	url = https://github.com/maxmind/MaxMind-DB

README.rst

@@ -46,7 +46,7 @@ Web Service Usage
 To use this API, you first construct either a ``geoip2.webservice.Client`` or
 ``geoip2.webservice.AsyncClient``, passing your MaxMind ``account_id`` and
 ``license_key`` to the constructor. To use the GeoLite2 web service instead of
-GeoIP2 Precision, set the optional ``host`` keyword argument to
+the GeoIP2 web service, set the optional ``host`` keyword argument to
 ``geolite.info``.
 
 After doing this, you may call the method corresponding to request type
@@ -68,7 +68,7 @@ Sync Web Service Example
     >>> # This creates a Client object that can be reused across requests.
     >>> # Replace "42" with your account ID and "license_key" with your license
     >>> # key. Set the "host" keyword argument to "geolite.info" to use the
-    >>> # GeoLite2 web service instead of GeoIP2 Precision.
+    >>> # GeoLite2 web service instead of the GeoIP2 web service.
     >>> with geoip2.webservice.Client(42, 'license_key') as client:
     >>>
     >>>     # Replace "city" with the method corresponding to the web service
@@ -118,7 +118,7 @@ Async Web Service Example
     >>>     #
     >>>     # Replace "42" with your account ID and "license_key" with your license
     >>>     # key. Set the "host" keyword argument to "geolite.info" to use the
-    >>>     # GeoLite2 web service instead of GeoIP2 Precision.
+    >>>     # GeoLite2 web service instead of the GeoIP2 web service.
     >>>     async with geoip2.webservice.AsyncClient(42, 'license_key') as client:
     >>>
     >>>         # Replace "city" with the method corresponding to the web service
@@ -158,7 +158,7 @@ Web Service Client Exceptions
 -----------------------------
 
 For details on the possible errors returned by the web service itself, see
-https://dev.maxmind.com/geoip/docs/web-services?lang=en for the GeoIP2 Precision web
+https://dev.maxmind.com/geoip/docs/web-services?lang=en for the GeoIP2 web
 service docs.
 
 If the web service returns an explicit error document, this is thrown as a

docs/conf.py

@@ -49,7 +49,7 @@
 
 # General information about the project.
 project = "geoip2"
-copyright = "2013-2021, MaxMind, Inc."
+copyright = "2013-2022, MaxMind, Inc."
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

docs/index.rst

@@ -38,6 +38,6 @@ Indices and tables
 * :ref:`modindex`
 * :ref:`search`
 
-:copyright: (c) 2013-2021 by MaxMind, Inc.
+:copyright: (c) 2013-2022 by MaxMind, Inc.
 :license: Apache License, Version 2.0
 

geoip2/__init__.py

@@ -4,4 +4,4 @@
 __version__ = "4.5.0"
 __author__ = "Gregory Oschwald"
 __license__ = "Apache License, Version 2.0"
-__copyright__ = "Copyright (c) 2013-2021 Maxmind, Inc."
+__copyright__ = "Copyright (c) 2013-2022 Maxmind, Inc."

geoip2/models.py

@@ -20,7 +20,7 @@
 
 
 class Country(SimpleEquality):
-    """Model for the GeoIP2 Precision: Country and the GeoIP2 Country database.
+    """Model for the Country web service and Country database.
 
     This class provides the following attributes:
 
@@ -105,7 +105,7 @@ def __repr__(self) -> str:
 
 
 class City(Country):
-    """Model for the GeoIP2 Precision: City and the GeoIP2 City database.
+    """Model for the City Plus web service and the City database.
 
     .. attribute:: city
 
@@ -193,7 +193,7 @@ def __init__(
 
 
 class Insights(City):
-    """Model for the GeoIP2 Precision: Insights web service endpoint.
+    """Model for the GeoIP2 Insights web service.
 
     .. attribute:: city
 

geoip2/records.py

@@ -61,7 +61,7 @@ class City(PlaceRecord):
 
       A value from 0-100 indicating MaxMind's
       confidence that the city is correct. This attribute is only available
-      from the Insights end point and the GeoIP2 Enterprise database.
+      from the Insights end point and the Enterprise database.
 
       :type: int
 
@@ -169,7 +169,7 @@ class Country(PlaceRecord):
 
       A value from 0-100 indicating MaxMind's confidence that
       the country is correct. This attribute is only available from the
-      Insights end point and the GeoIP2 Enterprise database.
+      Insights end point and the Enterprise database.
 
       :type: int
 
@@ -245,7 +245,7 @@ class RepresentedCountry(Country):
 
       A value from 0-100 indicating MaxMind's confidence that
       the country is correct. This attribute is only available from the
-      Insights end point and the GeoIP2 Enterprise database.
+      Insights end point and the Enterprise database.
 
       :type: int
 
@@ -449,8 +449,7 @@ class Postal(Record):
 
       A value from 0-100 indicating
       MaxMind's confidence that the postal code is correct. This attribute is
-      only available from the Insights end point and the GeoIP2 Enterprise
-      database.
+      only available from the Insights end point and the Enterprise database.
 
       :type: int
 
@@ -479,8 +478,7 @@ class Subdivision(PlaceRecord):
 
       This is a value from 0-100 indicating MaxMind's
       confidence that the subdivision is correct. This attribute is only
-      available from the Insights end point and the GeoIP2 Enterprise
-      database.
+      available from the Insights end point and the Enterprise database.
 
       :type: int
 
@@ -586,17 +584,16 @@ class Traits(Record):
       The `autonomous system
       number <http://en.wikipedia.org/wiki/Autonomous_system_(Internet)>`_
       associated with the IP address. This attribute is only available from
-      the City and Insights web service end points and the GeoIP2 Enterprise
-      database.
+      the City Plus and Insights web services and the Enterprise database.
 
       :type: int
 
     .. attribute:: autonomous_system_organization
 
       The organization associated with the registered `autonomous system
       number <http://en.wikipedia.org/wiki/Autonomous_system_(Internet)>`_ for
-      the IP address. This attribute is only available from the City and
-      Insights web service end points and the GeoIP2 Enterprise database.
+      the IP address. This attribute is only available from the City Plus and
+      Insights web service end points and the Enterprise database.
 
       :type: str
 
@@ -611,7 +608,7 @@ class Traits(Record):
 
       Additional values may be added in the future.
 
-      This attribute is only available in the GeoIP2 Enterprise database.
+      This attribute is only available in the Enterprise database.
 
       :type: str
 
@@ -620,7 +617,7 @@ class Traits(Record):
       The second level domain associated with the
       IP address. This will be something like "example.com" or
       "example.co.uk", not "foo.example.com". This attribute is only available
-      from the City and Insights web service end points and the GeoIP2
+      from the City Plus and Insights web service end points and the
       Enterprise database.
 
       :type: str
@@ -638,7 +635,7 @@ class Traits(Record):
     .. attribute:: is_anonymous
 
       This is true if the IP address belongs to any sort of anonymous network.
-      This attribute is only available from GeoIP2 Precision Insights.
+      This attribute is only available from Insights.
 
       :type: bool
 
@@ -662,38 +659,38 @@ class Traits(Record):
       them, we will likely only flag their IP ranges using the
       ``is_hosting_provider`` attribute.
 
-      This attribute is only available from GeoIP2 Precision Insights.
+      This attribute is only available from Insights.
 
       :type: bool
 
     .. attribute:: is_hosting_provider
 
       This is true if the IP address belongs to a hosting or VPN provider
       (see description of ``is_anonymous_vpn`` attribute).
-      This attribute is only available from GeoIP2 Precision Insights.
+      This attribute is only available from Insights.
 
       :type: bool
 
     .. attribute:: is_legitimate_proxy
 
       This attribute is true if MaxMind believes this IP address to be a
       legitimate proxy, such as an internal VPN used by a corporation. This
-      attribute is only available in the GeoIP2 Enterprise database.
+      attribute is only available in the Enterprise database.
 
       :type: bool
 
     .. attribute:: is_public_proxy
 
       This is true if the IP address belongs to a public proxy. This attribute
-      is only available from GeoIP2 Precision Insights.
+      is only available from Insights.
 
       :type: bool
 
     .. attribute:: is_residential_proxy
 
       This is true if the IP address is on a suspected anonymizing network
       and belongs to a residential ISP. This attribute is only available from
-      GeoIP2 Precision Insights.
+      Insights.
 
       :type: bool
 
@@ -714,33 +711,33 @@ class Traits(Record):
     .. attribute:: is_tor_exit_node
 
       This is true if the IP address is a Tor exit node. This attribute is
-      only available from GeoIP2 Precision Insights.
+      only available from Insights.
 
       :type: bool
 
     .. attribute:: isp
 
       The name of the ISP associated with the IP address. This attribute is
-      only available from the City and Insights web service end points and the
-      GeoIP2 Enterprise database.
+      only available from the City Plus and Insights web services and the
+      Enterprise database.
 
       :type: str
 
     .. attribute: mobile_country_code
 
       The `mobile country code (MCC)
       <https://en.wikipedia.org/wiki/Mobile_country_code>`_ associated with the
-      IP address and ISP. This attribute is available from the City and
-      Insights web services and the GeoIP2 Enterprise database.
+      IP address and ISP. This attribute is available from the City Plus and
+      Insights web services and the Enterprise database.
 
       :type: str
 
     .. attribute: mobile_network_code
 
       The `mobile network code (MNC)
       <https://en.wikipedia.org/wiki/Mobile_country_code>`_ associated with the
-      IP address and ISP. This attribute is available from the City and
-      Insights web services and the GeoIP2 Enterprise database.
+      IP address and ISP. This attribute is available from the City Plus and
+      Insights web services and the Enterprise database.
 
       :type: str
 
@@ -755,8 +752,8 @@ class Traits(Record):
     .. attribute:: organization
 
       The name of the organization associated with the IP address. This
-      attribute is only available from the City and Insights web service end
-      points and the GeoIP2 Enterprise database.
+      attribute is only available from the City Plus and Insights web services
+      and the Enterprise database.
 
       :type: str
 
@@ -769,17 +766,17 @@ class Traits(Record):
       thirty.
 
       This indicator can be useful for deciding whether an IP address represents
-      the same user over time. This attribute is only available from GeoIP2
-      Precision Insights.
+      the same user over time. This attribute is only available from
+      Insights.
 
       :type: float
 
     .. attribute:: user_count
 
       The estimated number of users sharing the IP/network during the past 24
       hours. For IPv4, the count is for the individual IP. For IPv6, the count
-      is for the /64 network. This attribute is only available from GeoIP2
-      Precision Insights.
+      is for the /64 network. This attribute is only available from
+      Insights.
 
       :type: int
 
@@ -805,7 +802,7 @@ class Traits(Record):
       * traveler
 
       This attribute is only available from the Insights end point and the
-      GeoIP2 Enterprise database.
+      Enterprise database.
 
       :type: str
 

geoip2/webservice.py

@@ -3,19 +3,19 @@
 WebServices Client API
 ============================
 
-This class provides a client API for all the GeoIP2 Precision web service end
-points. The end points are Country, City, and Insights. Each end point returns
-a different set of data about an IP address, with Country returning the least
+This class provides a client API for all the GeoIP2 web services. The web
+services are Country, City Plus, and Insights. Each service returns a
+different set of data about an IP address, with Country returning the least
 data and Insights the most.
 
-Each web service end point is represented by a different model class, and
-these model classes in turn contain multiple record classes. The record
-classes have attributes which contain data about the IP address.
+Each service is represented by a different model class, and these model
+classes in turn contain multiple record classes. The record classes have
+attributes which contain data about the IP address.
 
-If the web service does not return a particular piece of data for an IP
-address, the associated attribute is not populated.
+If the service does not return a particular piece of data for an IP address,
+the associated attribute is not populated.
 
-The web service may not return any information for an entire record, in which
+The service may not return any information for an entire record, in which
 case all of the attributes for that record class will be empty.
 
 SSL
@@ -219,8 +219,8 @@ class AsyncClient(BaseClient):
     The following keyword arguments are also accepted:
 
     :param host: The hostname to make a request against. This defaults to
-      "geoip.maxmind.com". To use the GeoLite2 web service instead of GeoIP2
-      Precision, set this to "geolite.info".
+      "geoip.maxmind.com". To use the GeoLite2 web service instead of the
+      GeoIP2 web service, set this to "geolite.info".
     :param locales: This is list of locale codes. This argument will be
       passed on to record classes to use when their name properties are
       called. The default value is ['en'].
@@ -276,7 +276,7 @@ def __init__(  # pylint: disable=too-many-arguments
         self._proxy = proxy
 
     async def city(self, ip_address: IPAddress = "me") -> City:
-        """Call City endpoint with the specified IP.
+        """Call City Plus endpoint with the specified IP.
 
         :param ip_address: IPv4 or IPv6 address as a string. If no
            address is provided, the address that the web service is
@@ -307,7 +307,7 @@ async def country(self, ip_address: IPAddress = "me") -> Country:
     async def insights(self, ip_address: IPAddress = "me") -> Insights:
         """Call the Insights endpoint with the specified IP.
 
-        Insights is only supported by GeoIP2 Precision. The GeoLite2 web
+        Insights is only supported by the GeoIP2 web service. The GeoLite2 web
         service does not support it.
 
         :param ip_address: IPv4 or IPv6 address as a string. If no address
@@ -378,8 +378,8 @@ class Client(BaseClient):
     The following keyword arguments are also accepted:
 
     :param host: The hostname to make a request against. This defaults to
-      "geoip.maxmind.com". To use the GeoLite2 web service instead of GeoIP2
-      Precision, set this to "geolite.info".
+      "geoip.maxmind.com". To use the GeoLite2 web service instead of the
+      GeoIP2 web service, set this to "geolite.info".
     :param locales: This is list of locale codes. This argument will be
       passed on to record classes to use when their name properties are
       called. The default value is ['en'].
@@ -437,7 +437,7 @@ def __init__(  # pylint: disable=too-many-arguments
             self._proxies = {"https": proxy}
 
     def city(self, ip_address: IPAddress = "me") -> City:
-        """Call City endpoint with the specified IP.
+        """Call City Plus endpoint with the specified IP.
 
         :param ip_address: IPv4 or IPv6 address as a string. If no
            address is provided, the address that the web service is
@@ -465,7 +465,7 @@ def country(self, ip_address: IPAddress = "me") -> Country:
     def insights(self, ip_address: IPAddress = "me") -> Insights:
         """Call the Insights endpoint with the specified IP.
 
-        Insights is only supported by GeoIP2 Precision. The GeoLite2 web
+        Insights is only supported by the GeoIP2 web service. The GeoLite2 web
         service does not support it.
 
         :param ip_address: IPv4 or IPv6 address as a string. If no address