mirror of https://gerrit.osmocom.org/pysim
Python 2 is deprecated, remove backwards compatibility chunks
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: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ffchanges/04/15504/22
parent
1f8acd9884
commit
79f5b6080b
|
@ -31,12 +31,7 @@ import random
|
|||
import re
|
||||
import sys
|
||||
import traceback
|
||||
|
||||
try:
|
||||
import json
|
||||
except ImportError:
|
||||
# Python < 2.5
|
||||
import simplejson as json
|
||||
import json
|
||||
|
||||
from pySim.commands import SimCardCommands
|
||||
from pySim.cards import _cards_classes, card_detect
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -23,6 +23,7 @@
|
|||
PYSIM_PROG=../pySim-prog.py
|
||||
PYSIM_READ=../pySim-read.py
|
||||
TEMPFILE=temp.tmp
|
||||
PYTHON=python3
|
||||
|
||||
set -e
|
||||
|
||||
|
@ -76,7 +77,7 @@ function check_card {
|
|||
CARD_NAME=$2
|
||||
echo "Verifying card ..."
|
||||
stat ./$CARD_NAME.ok > /dev/null
|
||||
python $PYSIM_READ -p $TERMINAL > $TEMPFILE
|
||||
$PYTHON $PYSIM_READ -p $TERMINAL > $TEMPFILE
|
||||
set +e
|
||||
CARD_DIFF=$(diff $TEMPFILE ./$CARD_NAME.ok)
|
||||
set -e
|
||||
|
@ -106,7 +107,7 @@ function check_card {
|
|||
function gen_ok_file {
|
||||
TERMINAL=$1
|
||||
CARD_NAME=$2
|
||||
python $PYSIM_READ -p $TERMINAL > "$CARD_NAME.ok"
|
||||
$PYTHON $PYSIM_READ -p $TERMINAL > "$CARD_NAME.ok"
|
||||
echo "Generated file: $CARD_NAME.ok"
|
||||
echo "------------8<------------"
|
||||
cat "$CARD_NAME.ok"
|
||||
|
@ -166,7 +167,7 @@ function run_test {
|
|||
ADM_OPT="-A"
|
||||
ADM=$ADM_HEX
|
||||
fi
|
||||
python $PYSIM_PROG -p $I -t $CARD_NAME -o $OPC -k $KI -x $MCC -y $MNC -i $IMSI -s $ICCID --msisdn $MSISDN $ADM_OPT $ADM
|
||||
$PYTHON $PYSIM_PROG -p $I -t $CARD_NAME -o $OPC -k $KI -x $MCC -y $MNC -i $IMSI -s $ICCID --msisdn $MSISDN $ADM_OPT $ADM
|
||||
check_card $I $CARD_NAME
|
||||
echo ""
|
||||
done
|
||||
|
|
Loading…
Reference in New Issue