Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Replaced deprecated freegeoip.net endpoint with freegeoip.live #377

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 | | |
Expand Down
6 changes: 3 additions & 3 deletions docs/providers/FreeGeoIP.rst
Original file line number Diff line number Diff line change
@@ -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.
Expand Down Expand Up @@ -37,4 +37,4 @@ Parameters
References
----------

- `API Reference <http://freegeoip.net/>`_
- `API Reference <https://freegeoip.live/>`_
8 changes: 4 additions & 4 deletions geocoder/freegeoip.py
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand Down