catarrh/pysim-local
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Python 2 is deprecated, remove backwards compatibility chunks

Browse Source 
pySim has already been migrated to Python 3 in another change [1],
and the build verification has been migrated to Debian 10 with
Python 3.7.  However, there is still some backwards compatibility
code left.  Let's get rid of it.

[1] Ic78da9c03e99f59d142c93394051bbc2751f0205

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Tweaked-by: Vadim Yanitskiy <vyanitskiy@sysmocom.de>
Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff
This commit is contained in:
Denis 'GNUtoo' Carikli
2020-02-15 04:02:57 +07:00
committed by Vadim Yanitskiy
parent 1f8acd9884
commit 79f5b6080b
3 changed files with 6 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pySim/utils.py
View File

@@ -720,20 +720,13 @@ def get_addr_type(addr):
if not len(addr):
return None
import sys
# Handle python3 and python2 - unicode
if sys.version_info[0] < 3:
addr_str = unicode(addr)
else:
addr_str = addr
addr_list = addr.split('.')
# Check for IPv4/IPv6
try:
import ipaddress
# Throws ValueError if addr is not correct
ipa = ipaddress.ip_address(addr_str)
ipa = ipaddress.ip_address(addr)
if ipa.version == 4:
return 0x01