Removed city_isp_org() and omni()

Author: oschwald

HISTORY.rst

@@ -6,11 +6,13 @@ History
 0.7.0 (2014-09-XX)
 ++++++++++++++++++
 
-- The ``geoip2.database.Reader`` lookup methods (e.g., ``city()``, ``isp()``)
+* IMPORTANT: The deprecated ``city_isp_org()`` and ``omni()`` methods have
+  been removed.
+* The ``geoip2.database.Reader`` lookup methods (e.g., ``city()``, ``isp()``)
   now raise a ``TypeError`` if they are used with a database that does not
   match the method. In particular, doing a ``city()`` lookup on a GeoIP2
   Country database will result in an error and vice versa.
-- A ``metadata()`` method has been added to the ``geoip2.database.Reader``
+* A ``metadata()`` method has been added to the ``geoip2.database.Reader``
   class. This returns a ``maxminddb.reader.Metadata`` object with information
   about the database.
 

geoip2/webservice.py

@@ -108,21 +108,6 @@ def city(self, ip_address='me'):
         """
         return self._response_for('city', geoip2.models.City, ip_address)
 
-    def city_isp_org(self, ip_address='me'):
-        """This method calls the GeoIP2 Precision: City endpoint.
-
-        :param ip_address: IPv4 or IPv6 address as a string. If no
-          address is provided, the address that the web service is called
-          from will be used.
-
-        :returns: :py:class:`geoip2.models.City` object
-
-        .. deprecated:: 0.6.0
-           Use :py:method:`city` instead.
-
-        """
-        return self.city(ip_address)
-
     def country(self, ip_address='me'):
         """This method calls the GeoIP2 Country endpoint.
 
@@ -152,21 +137,6 @@ def insights(self, ip_address='me'):
         return self._response_for('insights', geoip2.models.Insights,
                                   ip_address)
 
-    def omni(self, ip_address='me'):
-        """This method calls the GeoIP2 Precision: Insights endpoint.
-
-        :param ip_address: IPv4 or IPv6 address as a string. If no address
-          is provided, the address that the web service is called from will
-          be used.
-
-        :returns: :py:class:`geoip2.models.Insights` object
-
-        .. deprecated:: 0.6.0
-           Use :py:method:`insights` instead.
-
-        """
-        return self.insights(ip_address)
-
     def _response_for(self, path, model_class, ip_address):
         if ip_address != 'me':
             ip_address = str(ipaddress.ip_address(ip_address))

tests/webservice_test.py

@@ -253,25 +253,15 @@ def test_city_ok(self):
         self.assertEqual(type(city), geoip2.models.City,
                          'return value of client.city')
 
-    def test_city_isp_org_ok(self):
-        httpretty.register_uri(httpretty.GET,
-                               self.base_uri + 'city/1.2.3.4',
-                               body=json.dumps(self.country),
-                               status=200,
-                               content_type=self._content_type('country'))
-        city_isp_org = self.client.city_isp_org('1.2.3.4')
-        self.assertEqual(type(city_isp_org), geoip2.models.City,
-                         'return value of client.city_isp_org')
-
     def test_insights_ok(self):
         httpretty.register_uri(httpretty.GET,
                                self.base_uri + 'insights/1.2.3.4',
                                body=json.dumps(self.country),
                                status=200,
                                content_type=self._content_type('country'))
-        omni = self.client.insights('1.2.3.4')
-        self.assertEqual(type(omni), geoip2.models.Insights,
-                         'return value of client.omni')
+        insights = self.client.insights('1.2.3.4')
+        self.assertEqual(type(insights), geoip2.models.Insights,
+                         'return value of client.insights')
 
     def test_insights_ok(self):
         httpretty.register_uri(httpretty.GET,