<p>fixeria <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/15504">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Python 2 is deprecated, remove backwards compatibility chunks<br><br>pySim has already been migrated to Python 3 in another change [1],<br>and the build verification has been migrated to Debian 10 with<br>Python 3.7. However, there is still some backwards compatibility<br>code left. Let's get rid of it.<br><br>[1] Ic78da9c03e99f59d142c93394051bbc2751f0205<br><br>Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org><br>Tweaked-by: Vadim Yanitskiy <vyanitskiy@sysmocom.de><br>Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff<br>---<br>M pySim-prog.py<br>M pySim/utils.py<br>M tests/pysim-test.sh<br>3 files changed, 6 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim-prog.py b/pySim-prog.py</span><br><span>index 4f54963..662824c 100755</span><br><span>--- a/pySim-prog.py</span><br><span>+++ b/pySim-prog.py</span><br><span>@@ -31,12 +31,7 @@</span><br><span> import re</span><br><span> import sys</span><br><span> import traceback</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-try:</span><br><span style="color: hsl(0, 100%, 40%);">- import json</span><br><span style="color: hsl(0, 100%, 40%);">-except ImportError:</span><br><span style="color: hsl(0, 100%, 40%);">- # Python < 2.5</span><br><span style="color: hsl(0, 100%, 40%);">- import simplejson as json</span><br><span style="color: hsl(120, 100%, 40%);">+import json</span><br><span> </span><br><span> from pySim.commands import SimCardCommands</span><br><span> from pySim.cards import _cards_classes, card_detect</span><br><span>diff --git a/pySim/utils.py b/pySim/utils.py</span><br><span>index f7190d4..6dbd980 100644</span><br><span>--- a/pySim/utils.py</span><br><span>+++ b/pySim/utils.py</span><br><span>@@ -720,20 +720,13 @@</span><br><span> if not len(addr):</span><br><span> return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- import sys</span><br><span style="color: hsl(0, 100%, 40%);">- # Handle python3 and python2 - unicode</span><br><span style="color: hsl(0, 100%, 40%);">- if sys.version_info[0] < 3:</span><br><span style="color: hsl(0, 100%, 40%);">- addr_str = unicode(addr)</span><br><span style="color: hsl(0, 100%, 40%);">- else:</span><br><span style="color: hsl(0, 100%, 40%);">- addr_str = addr</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> addr_list = addr.split('.')</span><br><span> </span><br><span> # Check for IPv4/IPv6</span><br><span> try:</span><br><span> import ipaddress</span><br><span> # Throws ValueError if addr is not correct</span><br><span style="color: hsl(0, 100%, 40%);">- ipa = ipaddress.ip_address(addr_str)</span><br><span style="color: hsl(120, 100%, 40%);">+ ipa = ipaddress.ip_address(addr)</span><br><span> </span><br><span> if ipa.version == 4:</span><br><span> return 0x01</span><br><span>diff --git a/tests/pysim-test.sh b/tests/pysim-test.sh</span><br><span>index 7ee9834..4004c18 100755</span><br><span>--- a/tests/pysim-test.sh</span><br><span>+++ b/tests/pysim-test.sh</span><br><span>@@ -23,6 +23,7 @@</span><br><span> PYSIM_PROG=../pySim-prog.py</span><br><span> PYSIM_READ=../pySim-read.py</span><br><span> TEMPFILE=temp.tmp</span><br><span style="color: hsl(120, 100%, 40%);">+PYTHON=python3</span><br><span> </span><br><span> set -e</span><br><span> </span><br><span>@@ -76,7 +77,7 @@</span><br><span> CARD_NAME=$2</span><br><span> echo "Verifying card ..."</span><br><span> stat ./$CARD_NAME.ok > /dev/null</span><br><span style="color: hsl(0, 100%, 40%);">- python $PYSIM_READ -p $TERMINAL > $TEMPFILE</span><br><span style="color: hsl(120, 100%, 40%);">+ $PYTHON $PYSIM_READ -p $TERMINAL > $TEMPFILE</span><br><span> set +e</span><br><span> CARD_DIFF=$(diff $TEMPFILE ./$CARD_NAME.ok)</span><br><span> set -e</span><br><span>@@ -106,7 +107,7 @@</span><br><span> function gen_ok_file {</span><br><span> TERMINAL=$1</span><br><span> CARD_NAME=$2</span><br><span style="color: hsl(0, 100%, 40%);">- python $PYSIM_READ -p $TERMINAL > "$CARD_NAME.ok"</span><br><span style="color: hsl(120, 100%, 40%);">+ $PYTHON $PYSIM_READ -p $TERMINAL > "$CARD_NAME.ok"</span><br><span> echo "Generated file: $CARD_NAME.ok"</span><br><span> echo "------------8<------------"</span><br><span> cat "$CARD_NAME.ok"</span><br><span>@@ -166,7 +167,7 @@</span><br><span> ADM_OPT="-A"</span><br><span> ADM=$ADM_HEX</span><br><span> fi</span><br><span style="color: hsl(0, 100%, 40%);">- 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</span><br><span style="color: hsl(120, 100%, 40%);">+ $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</span><br><span> check_card $I $CARD_NAME</span><br><span> echo ""</span><br><span> done</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/15504">change 15504</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/pysim/+/15504"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: pysim </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I430d173535e0cd5bb895b9dfc9070cbc40cfc8ff </div>
<div style="display:none"> Gerrit-Change-Number: 15504 </div>
<div style="display:none"> Gerrit-PatchSet: 22 </div>
<div style="display:none"> Gerrit-Owner: gnutoo <GNUtoo@cyberdimension.org> </div>
<div style="display:none"> Gerrit-Reviewer: Hoernchen <ewild@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>