From 5fbcb5e89bfd022a7ea1ec77ebb7788db4c60b98 Mon Sep 17 00:00:00 2001 From: Luke Tainton Date: Sun, 10 Jul 2022 15:03:30 +0100 Subject: [PATCH] DS: FLK-E501 --- app/main.py | 8 ++++---- app/query_normalisation.py | 3 ++- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/app/main.py b/app/main.py index 6223415..150ce2e 100644 --- a/app/main.py +++ b/app/main.py @@ -44,13 +44,13 @@ def main(): as_number = get_autonomous_system_number(ip_info.get("as")) # Assemble list for table generation + country = ip_info.get("country") + region = ip_info.get("regionName") + city = ip_info.get("city") table_data = [ ["IP Address", ip_info.get("query")], ["Organization", ip_info.get("org")], - [ - "Location", - f"{ip_info.get('country')}/{ip_info.get('regionName')}/{ip_info.get('city')}", - ], + ["Location", f"{country}/{region}/{city}"], ["Timezone", ip_info.get("timezone")], ["Internet Service Provider", ip_info.get("isp")], ["Autonomous System", as_number], diff --git a/app/query_normalisation.py b/app/query_normalisation.py index 5bf32fd..3aa06b2 100644 --- a/app/query_normalisation.py +++ b/app/query_normalisation.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3 -"""MODULE: Provides functions that ensure an IP address is available to query the APIs for.""" +"""MODULE: Provides functions that ensure an IP address is +available to query the APIs for.""" import socket import ipaddress