<p>fixeria has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/pysim/+/23633">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Py2 -> Py3: do not inherit classes from object<br><br>https://stackoverflow.com/questions/4015417/why-do-python-classes-inherit-object/45062077<br><br>Change-Id: I15003ba591510d68f3235f71526ad5d8a456088e<br>---<br>M pySim/card_data.py<br>M pySim/cards.py<br>M pySim/commands.py<br>M pySim/filesystem.py<br>M pySim/transport/__init__.py<br>M pySim/transport/calypso.py<br>6 files changed, 10 insertions(+), 10 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/33/23633/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/pySim/card_data.py b/pySim/card_data.py</span><br><span>index ebc63a6..6c162e8 100644</span><br><span>--- a/pySim/card_data.py</span><br><span>+++ b/pySim/card_data.py</span><br><span>@@ -24,7 +24,7 @@</span><br><span> </span><br><span> card_data_provider = []</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class CardData(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class CardData:</span><br><span> </span><br><span>        VALID_FIELD_NAMES = ['ICCID', 'ADM1', 'IMSI', 'PIN1', 'PIN2', 'PUK1', 'PUK2']</span><br><span> </span><br><span>diff --git a/pySim/cards.py b/pySim/cards.py</span><br><span>index 5eb2884..a9ad7ff 100644</span><br><span>--- a/pySim/cards.py</span><br><span>+++ b/pySim/cards.py</span><br><span>@@ -29,7 +29,7 @@</span><br><span> from smartcard.util import toBytes</span><br><span> from pytlv.TLV import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class Card(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class Card:</span><br><span> </span><br><span>  def __init__(self, scc):</span><br><span>             self._scc = scc</span><br><span>diff --git a/pySim/commands.py b/pySim/commands.py</span><br><span>index 7919099..5f60280 100644</span><br><span>--- a/pySim/commands.py</span><br><span>+++ b/pySim/commands.py</span><br><span>@@ -24,7 +24,7 @@</span><br><span> from pySim.utils import rpad, b2h, sw_match</span><br><span> from pySim.exceptions import SwMatchError</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class SimCardCommands(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class SimCardCommands:</span><br><span>   def __init__(self, transport):</span><br><span>               self._tp = transport</span><br><span>                 self._cla_byte = "a0"</span><br><span>diff --git a/pySim/filesystem.py b/pySim/filesystem.py</span><br><span>index 3eea2f4..8324ab1 100644</span><br><span>--- a/pySim/filesystem.py</span><br><span>+++ b/pySim/filesystem.py</span><br><span>@@ -36,7 +36,7 @@</span><br><span> from pySim.utils import sw_match, h2b, b2h, is_hex</span><br><span> from pySim.exceptions import *</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class CardFile(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class CardFile:</span><br><span>     """Base class for all objects in the smart card filesystem.</span><br><span>     Serve as a common ancestor to all other file types; rarely used directly.</span><br><span>     """</span><br><span>@@ -799,7 +799,7 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class RuntimeState(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class RuntimeState:</span><br><span>     """Represent the runtime state of a session with a card."""</span><br><span>     def __init__(self, card, profile:'CardProfile'):</span><br><span>         """</span><br><span>@@ -1050,7 +1050,7 @@</span><br><span> </span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class FileData(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class FileData:</span><br><span>     """Represent the runtime, on-card data."""</span><br><span>     def __init__(self, fdesc):</span><br><span>         self.desc = fdesc</span><br><span>@@ -1076,7 +1076,7 @@</span><br><span>                 return (class_str, descr)</span><br><span>     return None</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class CardApplication(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class CardApplication:</span><br><span>     """A card application is represented by an ADF (with contained hierarchy) and optionally</span><br><span>        some SW definitions."""</span><br><span>     def __init__(self, name, adf:Optional[CardADF]=None, aid:str=None, sw:dict=None):</span><br><span>@@ -1109,7 +1109,7 @@</span><br><span>         """</span><br><span>         return interpret_sw(self.sw, sw)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class CardProfile(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class CardProfile:</span><br><span>     """A Card Profile describes a card, it's filessystem hierarchy, an [initial] list of</span><br><span>        applications as well as profile-specific SW and shell commands.  Every card has</span><br><span>        one card profile, but there may be multiple applications within that profile."""</span><br><span>diff --git a/pySim/transport/__init__.py b/pySim/transport/__init__.py</span><br><span>index f946af8..d8579a3 100644</span><br><span>--- a/pySim/transport/__init__.py</span><br><span>+++ b/pySim/transport/__init__.py</span><br><span>@@ -23,7 +23,7 @@</span><br><span> # along with this program.  If not, see <http://www.gnu.org/licenses/>.</span><br><span> #</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class LinkBase(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class LinkBase:</span><br><span>   """Base class for link/transport to card."""</span><br><span> </span><br><span>       def wait_for_card(self, timeout:int=None, newcardonly:bool=False):</span><br><span>diff --git a/pySim/transport/calypso.py b/pySim/transport/calypso.py</span><br><span>index 467d5ee..49d649d 100644</span><br><span>--- a/pySim/transport/calypso.py</span><br><span>+++ b/pySim/transport/calypso.py</span><br><span>@@ -25,7 +25,7 @@</span><br><span> from pySim.exceptions import *</span><br><span> from pySim.utils import h2b, b2h</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-class L1CTLMessage(object):</span><br><span style="color: hsl(120, 100%, 40%);">+class L1CTLMessage:</span><br><span> </span><br><span>    # Every (encoded) L1CTL message has the following structure:</span><br><span>         #  - msg_length (2 bytes, net order)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/pysim/+/23633">change 23633</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/+/23633"/><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: I15003ba591510d68f3235f71526ad5d8a456088e </div>
<div style="display:none"> Gerrit-Change-Number: 23633 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>