From ac1be8305b9a17a39a8deaf28c2a49a5445babc1 Mon Sep 17 00:00:00 2001 From: Igor Chubin Date: Fri, 3 Apr 2020 20:58:51 +0200 Subject: [PATCH] lib/location.py: python3 fixes --- lib/location.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/lib/location.py b/lib/location.py index f931092..f47e833 100644 --- a/lib/location.py +++ b/lib/location.py @@ -9,6 +9,7 @@ precise location description. """ from __future__ import print_function +import sys import os import json import socket @@ -35,12 +36,15 @@ def is_ip(ip_addr): Check if `ip_addr` looks like an IP Address """ + if sys.version_info[0] < 3: + ip_addr = ip_addr.encode("utf-8") + try: - socket.inet_pton(socket.AF_INET, ip_addr.encode("utf-8")) + socket.inet_pton(socket.AF_INET, ip_addr) return True except socket.error: try: - socket.inet_pton(socket.AF_INET6, ip_addr.encode("utf-8")) + socket.inet_pton(socket.AF_INET6, ip_addr) return True except socket.error: return False