mirror of
https://gitea.osmocom.org/sim-card/pysim.git
synced 2026-03-29 21:54:49 +03:00
Migrate over to using pyosmocom
We're creating a 'pyosmocom' pypi module which contains a number of core Osmocom libraries / interfaces that are not specific to SIM card stuff contained here. The main modules moved in this initial step are pySim.tlv, pySim.utils and pySim.construct. utils is split, not all of the contents is unrelated to SIM Cards. The other two are moved completely. Change-Id: I4b63e45bcb0c9ba2424dacf85e0222aee735f411
This commit is contained in:
@@ -8,9 +8,10 @@ import abc
|
||||
import argparse
|
||||
from typing import Optional, Tuple
|
||||
from construct import Construct
|
||||
from osmocom.utils import b2h, h2b, i2h, Hexstr
|
||||
|
||||
from pySim.exceptions import *
|
||||
from pySim.utils import sw_match, b2h, h2b, i2h, Hexstr, SwHexstr, SwMatchstr, ResTuple
|
||||
from pySim.utils import SwHexstr, SwMatchstr, ResTuple, sw_match
|
||||
from pySim.cat import ProactiveCommand, CommandDetails, DeviceIdentities, Result
|
||||
|
||||
#
|
||||
|
||||
@@ -22,10 +22,11 @@ import socket
|
||||
import os
|
||||
import argparse
|
||||
from typing import Optional
|
||||
from osmocom.utils import h2b, b2h, Hexstr
|
||||
|
||||
from pySim.transport import LinkBase
|
||||
from pySim.exceptions import ReaderError, ProtocolError
|
||||
from pySim.utils import h2b, b2h, Hexstr, ResTuple
|
||||
from pySim.utils import ResTuple
|
||||
|
||||
|
||||
class L1CTLMessage:
|
||||
|
||||
@@ -22,8 +22,9 @@ import re
|
||||
import argparse
|
||||
from typing import Optional
|
||||
import serial
|
||||
from osmocom.utils import Hexstr
|
||||
|
||||
from pySim.utils import Hexstr, ResTuple
|
||||
from pySim.utils import ResTuple
|
||||
from pySim.transport import LinkBase
|
||||
from pySim.exceptions import ReaderError, ProtocolError
|
||||
|
||||
|
||||
@@ -27,9 +27,11 @@ from smartcard.Exceptions import NoCardException, CardRequestTimeoutException, C
|
||||
from smartcard.System import readers
|
||||
from smartcard.ExclusiveConnectCardConnection import ExclusiveConnectCardConnection
|
||||
|
||||
from osmocom.utils import h2i, i2h, Hexstr
|
||||
|
||||
from pySim.exceptions import NoCardError, ProtocolError, ReaderError
|
||||
from pySim.transport import LinkBase
|
||||
from pySim.utils import h2i, i2h, Hexstr, ResTuple
|
||||
from pySim.utils import ResTuple
|
||||
|
||||
|
||||
class PcscSimLink(LinkBase):
|
||||
|
||||
@@ -21,10 +21,11 @@ import os
|
||||
import argparse
|
||||
from typing import Optional
|
||||
import serial
|
||||
from osmocom.utils import h2b, b2h, Hexstr
|
||||
|
||||
from pySim.exceptions import NoCardError, ProtocolError
|
||||
from pySim.transport import LinkBase
|
||||
from pySim.utils import h2b, b2h, Hexstr, ResTuple
|
||||
from pySim.utils import ResTuple
|
||||
|
||||
|
||||
class SerialSimLink(LinkBase):
|
||||
|
||||
Reference in New Issue
Block a user