From be67c1e732d089e4e8ad83864b556e4ae47fbdf1 Mon Sep 17 00:00:00 2001 From: sahil sagwekar Date: Tue, 1 Nov 2022 01:22:25 +0530 Subject: [PATCH 1/2] fixes issue #928 --- ip_tracker/ipgeo.py | 17 +++++++++++------ ip_tracker/readme.md | 5 ++--- ip_tracker/requirements.txt | 1 - 3 files changed, 13 insertions(+), 10 deletions(-) delete mode 100644 ip_tracker/requirements.txt diff --git a/ip_tracker/ipgeo.py b/ip_tracker/ipgeo.py index 1c88b5749..6fed4d88e 100644 --- a/ip_tracker/ipgeo.py +++ b/ip_tracker/ipgeo.py @@ -1,16 +1,21 @@ -import requests +import http.client +import json import sys def main(): - url = "http://ip-api.com/json/" + url = "ip-api.com" + address = "" if len(sys.argv) > 1: # getting address from command line. address = ''.join(sys.argv[1:]) - url += address - - response = requests.request("GET", url) - response = response.json() + + conn = http.client.HTTPConnection(url) + conn.request("GET", f"/json/{address}") + res = conn.getresponse() + data = res.read().decode("utf-8") + # final response in JSON format + response = json.loads(data) if response['status'] == 'fail': sys.exit(f''' diff --git a/ip_tracker/readme.md b/ip_tracker/readme.md index ac3b6d475..3af5b8c32 100644 --- a/ip_tracker/readme.md +++ b/ip_tracker/readme.md @@ -11,7 +11,6 @@ IPGeo is a Python Scrpit for Fast, accurate IP Geolocation search. $python3 ipgeo.py # uses current ip address ``` -### Library required -`requests` + ### API used -https://ip-api.com/ free API, no API key required. \ No newline at end of file +https://ip-api.com/ free API, no API key required. diff --git a/ip_tracker/requirements.txt b/ip_tracker/requirements.txt deleted file mode 100644 index a8ed785e4..000000000 --- a/ip_tracker/requirements.txt +++ /dev/null @@ -1 +0,0 @@ -requests==2.26.0 From 75d3162f6e3c767a789bfdcbe9aef40389602844 Mon Sep 17 00:00:00 2001 From: sahil sagwekar Date: Mon, 21 Nov 2022 21:17:51 +0530 Subject: [PATCH 2/2] fixed the error given by flake8 linter --- ip_tracker/ipgeo.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ip_tracker/ipgeo.py b/ip_tracker/ipgeo.py index 6fed4d88e..35d4e3eae 100644 --- a/ip_tracker/ipgeo.py +++ b/ip_tracker/ipgeo.py @@ -9,7 +9,7 @@ def main(): if len(sys.argv) > 1: # getting address from command line. address = ''.join(sys.argv[1:]) - + conn = http.client.HTTPConnection(url) conn.request("GET", f"/json/{address}") res = conn.getresponse()