From 83fb099fb99f9c990988581bb9b2c4fb4e323893 Mon Sep 17 00:00:00 2001 From: Alexander Nevidimov Date: Tue, 27 Nov 2018 20:58:58 +0300 Subject: [PATCH] Replaced deprecated freegeoip.net endpoint with freegeoip.live --- README.md | 2 +- docs/providers/FreeGeoIP.rst | 6 +++--- geocoder/freegeoip.py | 8 ++++---- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index 1cdecfdb..1f97a1fe 100644 --- a/README.md +++ b/README.md @@ -206,7 +206,7 @@ $ geocode "Ottawa, ON" \ | [Baidu][Baidu] | China | API key | | yes | | | | [Bing][Bing] | World | API key | yes | yes | | yes | | [CanadaPost][CanadaPost] | Canada | API key | yes | | | | -| [FreeGeoIP][FreeGeoIP] This API endpoint is deprecated and will stop working on July 1st, 2018. | World | Rate Limit, [Policy][FreeGeoip-Policy] | | | | | +| [FreeGeoIP][FreeGeoIP] | World | Rate Limit, [Policy][FreeGeoip-Policy] | | | | | | [Gaode][Gaode] | China | API key | | yes | | | | [Geocoder.ca][Geocoder.ca] (Geolytica) | CA & US | Rate Limit | | | | | | [GeocodeFarm][GeocodeFarm] | World | [Policy][GeocodeFarm-Policy] | yes | yes | | | diff --git a/docs/providers/FreeGeoIP.rst b/docs/providers/FreeGeoIP.rst index 5aca41ff..f202946f 100644 --- a/docs/providers/FreeGeoIP.rst +++ b/docs/providers/FreeGeoIP.rst @@ -1,6 +1,6 @@ -FreeGeoIP.net +FreeGeoIP.live ============= -freegeoip.net provides a public HTTP API for software developers to +freegeoip.live provides a public HTTP API for software developers to search the geolocation of IP addresses. It uses a database of IP addresses that are associated to cities along with other relevant information like time zone, latitude and longitude. @@ -37,4 +37,4 @@ Parameters References ---------- -- `API Reference `_ +- `API Reference `_ diff --git a/geocoder/freegeoip.py b/geocoder/freegeoip.py index 9ad83a2d..0e55cfd1 100644 --- a/geocoder/freegeoip.py +++ b/geocoder/freegeoip.py @@ -94,9 +94,9 @@ def time_zone(self): class FreeGeoIPQuery(MultipleResultsQuery): """ - FreeGeoIP.net + FreeGeoIP.live ============= - freegeoip.net provides a public HTTP API for software developers to + freegeoip.live provides a public HTTP API for software developers to search the geolocation of IP addresses. It uses a database of IP addresses that are associated to cities along with other relevant information like time zone, latitude and longitude. @@ -107,12 +107,12 @@ class FreeGeoIPQuery(MultipleResultsQuery): API Reference ------------- - http://freegeoip.net/ + https://freegeoip.live/ """ provider = 'freegeoip' method = 'geocode' - _URL = 'https://freegeoip.net/json/' + _URL = 'https://freegeoip.live/json/' _RESULT_CLASS = FreeGeoIPResult _KEY_MANDATORY = False