fixeria
/
pycrate
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

globally remove Python 2 compat

This commit is contained in:
p1-bmu 2023-04-06 15:48:00 +02:00
parent 22c6a5daec
commit 87d633859b
33 changed files with 150 additions and 491 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pycrate_asn1c/asnproc.py
View File

@ -120,17 +120,11 @@ def get_spec_files(spec_dir):
spec_texts, spec_fn = [], [] spec_texts, spec_fn = [], []
for fn in load: for fn in load:
try: try:
if python_version < 3:
fd = open('%s%s' % (spec_dir, fn), 'r')
else:
fd = open('%s%s' % (spec_dir, fn), 'r', encoding='utf-8') fd = open('%s%s' % (spec_dir, fn), 'r', encoding='utf-8')
except Exception as err: except Exception as err:
raise(ASN1Err( raise(ASN1Err(
'[proc] unable to open spec file {0}, {1}'.format(fn, err))) '[proc] unable to open spec file {0}, {1}'.format(fn, err)))
try: try:
if python_version < 3:
spec_texts.append( fd.read().decode('utf-8') )
else:
spec_texts.append( fd.read() ) spec_texts.append( fd.read() )
except Exception as err: except Exception as err:
fd.close() fd.close()

13
pycrate_asn1c/dictobj.py
View File

@ -27,8 +27,6 @@
# *-------------------------------------------------------- # *--------------------------------------------------------
#*/ #*/
from .utils import python_version
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# ordered dictionnary # ordered dictionnary
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
@ -108,17 +106,6 @@ class ASN1Dict(object):
for key, val in other.items(): for key, val in other.items():
self.__setitem__(key, val) self.__setitem__(key, val)
if python_version <= 2:
def keys(self):
return list(self._index)
def items(self):
return [(k, self._dict[k]) for k in self._index]
def values(self):
return [self._dict[k] for k in self._index]
else:
def keys(self): def keys(self):
return self._index.__iter__() return self._index.__iter__()

3
pycrate_asn1c/generator.py
View File

@ -155,10 +155,7 @@ def value_to_defin(v, Obj=None, Gen=None, ind=None):
return '(%s, %s)' % (vv, vl) return '(%s, %s)' % (vv, vl)
elif Obj.TYPE == TYPE_OCT_STR: elif Obj.TYPE == TYPE_OCT_STR:
# byte-string # byte-string
if python_version > 2:
return repr(v) return repr(v)
else:
return 'b%s' % repr(v)
elif Obj.TYPE == TYPE_OID: elif Obj.TYPE == TYPE_OID:
# list of int -> convert to tuple # list of int -> convert to tuple
return repr(tuple(v)) return repr(tuple(v))

3
pycrate_asn1c/tokenizer.py
View File

@ -952,9 +952,6 @@ def test():
if fn[-4:] == '.asn': if fn[-4:] == '.asn':
fp = '%s%s/%s' % (p, S, fn) fp = '%s%s/%s' % (p, S, fn)
print(fp) print(fp)
if python_version < 3:
mods = tokenize_text(open(fp).read().decode('utf-8'))
else:
mods = tokenize_text(open(fp).read()) mods = tokenize_text(open(fp).read())
for modname, moddict in mods.items(): for modname, moddict in mods.items():
M[modname] = moddict M[modname] = moddict

4
pycrate_asn1c/utils.py
View File

@ -32,7 +32,7 @@ import pprint
from keyword import iskeyword from keyword import iskeyword
# pycrate_core is used only for basic library-wide functions / variables: # pycrate_core is used only for basic library-wide functions / variables:
# log(), python_version, integer_types, str_types # log(), integer_types, str_types
from pycrate_core.utils import * from pycrate_core.utils import *
from .err import ASN1Err from .err import ASN1Err
@ -42,7 +42,7 @@ from .err import ASN1Err
def asnlog(msg): def asnlog(msg):
""" """
customizable logging function for the whole asn1 part customizable logging function for the whole asn1c part
""" """
log(msg) log(msg)

36
pycrate_asn1rt/asnobj_basic.py
View File

@ -786,9 +786,6 @@ Specific attribute:
# base 10: character string encoding # base 10: character string encoding
if B0 == 1: if B0 == 1:
# NR1 encoding, simple whole numbers # NR1 encoding, simple whole numbers
if python_version < 3:
m = self._NR1_RE.match( bytes[1:] )
else:
m = self._NR1_RE.match( str(bytes[1:], 'ascii') ) m = self._NR1_RE.match( str(bytes[1:], 'ascii') )
if not m: if not m:
raise(ASN1BERDecodeErr('{0}: invalid REAL base 10 NR1 encoding, {1!r}'\ raise(ASN1BERDecodeErr('{0}: invalid REAL base 10 NR1 encoding, {1!r}'\
@ -797,9 +794,6 @@ Specific attribute:
self._val = (mant, 10, 0) self._val = (mant, 10, 0)
elif B0 == 2: elif B0 == 2:
# NR2 encoding, requires a decimal mark # NR2 encoding, requires a decimal mark
if python_version < 3:
m = self._NR2_RE.match( bytes[1:] )
else:
m = self._NR2_RE.match( str(bytes[1:], 'ascii') ) m = self._NR2_RE.match( str(bytes[1:], 'ascii') )
if not m: if not m:
raise(ASN1BERDecodeErr('{0}: invalid REAL base 10 NR2 encoding, {1!r}'\ raise(ASN1BERDecodeErr('{0}: invalid REAL base 10 NR2 encoding, {1!r}'\
@ -812,9 +806,6 @@ Specific attribute:
self._val = (int(i+d), 10, e) self._val = (int(i+d), 10, e)
elif B0 == 3: elif B0 == 3:
# NR3 encoding, requires the exponent notation # NR3 encoding, requires the exponent notation
if python_version < 3:
m = self._NR3_RE.match( bytes[1:] )
else:
m = self._NR3_RE.match( str(bytes[1:], 'ascii') ) m = self._NR3_RE.match( str(bytes[1:], 'ascii') )
if not m: if not m:
raise(ASN1BERDecodeErr('{0}: invalid REAL base 10 NR3 encoding, {1!r}'\ raise(ASN1BERDecodeErr('{0}: invalid REAL base 10 NR3 encoding, {1!r}'\
@ -890,20 +881,11 @@ Specific attribute:
raise(ASN1BEREncodeErr('{0}: invalid REAL base 10 encoding NR1 for decimal value'\ raise(ASN1BEREncodeErr('{0}: invalid REAL base 10 encoding NR1 for decimal value'\
.format(self.fullname()))) .format(self.fullname())))
i = self._val[0] * (10**self._val[2]) i = self._val[0] * (10**self._val[2])
if python_version < 3:
return '\x01' + \
ASN1CodecBER.ENC_REALNR1_SPA * ' ' + \
ASN1CodecBER.ENC_REALNR1_ZER * '0' + \
str(i)
else:
return b'\x01' + \ return b'\x01' + \
ASN1CodecBER.ENC_REALNR1_SPA * b' ' + \ ASN1CodecBER.ENC_REALNR1_SPA * b' ' + \
ASN1CodecBER.ENC_REALNR1_ZER * b'0' + \ ASN1CodecBER.ENC_REALNR1_ZER * b'0' + \
bytes(str(i), 'ascii') bytes(str(i), 'ascii')
elif ASN1CodecBER.ENC_REALNR == 2: elif ASN1CodecBER.ENC_REALNR == 2:
if python_version < 3:
i = bytes(self._val[0])
else:
i = bytes(str(self._val[0]), 'ascii') i = bytes(str(self._val[0]), 'ascii')
if self._val[2] >= 0: if self._val[2] >= 0:
# we need to add trailing zero # we need to add trailing zero
@ -926,9 +908,6 @@ Specific attribute:
ASN1CodecBER.ENC_REALNR2_ZERTRAIL * b'0' ASN1CodecBER.ENC_REALNR2_ZERTRAIL * b'0'
else: else:
#ASN1CodecBER.ENC_REALNR == 3 #ASN1CodecBER.ENC_REALNR == 3
if python_version < 3:
i, e = bytes(self._val[0]), self._val[2]
else:
i, e = bytes(str(self._val[0]), 'ascii'), self._val[2] i, e = bytes(str(self._val[0]), 'ascii'), self._val[2]
# remove trailing zero # remove trailing zero
while i[-1:] == b'0': while i[-1:] == b'0':
@ -936,9 +915,6 @@ Specific attribute:
e += 1 e += 1
if e == 0: if e == 0:
e = b'+0' e = b'+0'
elif python_version < 3:
e = bytes(e)
else:
e = bytes(str(e), 'ascii') e = bytes(str(e), 'ascii')
return b'\x03' + i + b'.E' + e return b'\x03' + i + b'.E' + e
else: else:
@ -957,12 +933,6 @@ Specific attribute:
LE = int_bytelen(E) LE = int_bytelen(E)
E = int_to_bytes(E, 8*LE) E = int_to_bytes(E, 8*LE)
N = uint_to_bytes(m, 8*uint_bytelen(m)) N = uint_to_bytes(m, 8*uint_bytelen(m))
if python_version < 3:
if LE > 3:
return chr(0x80 + (S<<6) + 3) + uint_to_bytes(LE) + E + N
else:
return chr(0x80 + (S<<6) + LE-1) + E + N
else:
if LE > 3: if LE > 3:
return bytes((0x80 + (S<<6) + 3, )) + uint_to_bytes(LE) + E + N return bytes((0x80 + (S<<6) + 3, )) + uint_to_bytes(LE) + E + N
else: else:
@ -1805,10 +1775,7 @@ Single value: Python tuple of int
for f in fact[:-1]: for f in fact[:-1]:
by.append( 0x80 + f ) by.append( 0x80 + f )
by.append( fact[-1] ) by.append( fact[-1] )
if python_version > 2:
return bytes(by) return bytes(by)
else:
return ''.join(map(chr, by))
class REL_OID(_OID): class REL_OID(_OID):
@ -1856,8 +1823,5 @@ Single value: Python tuple of int
for f in fact[:-1]: for f in fact[:-1]:
by.append( 0x80 + f ) by.append( 0x80 + f )
by.append( fact[-1] ) by.append( fact[-1] )
if python_version > 2:
return bytes(by) return bytes(by)
else:
return ''.join(map(chr, by))

3
pycrate_asn1rt/asnobj_ext.py
View File

@ -232,10 +232,7 @@ Single value: Python 2-tuple
if isinstance(self._val[0], str_types): if isinstance(self._val[0], str_types):
if self._val[0][:5] == '_unk_': if self._val[0][:5] == '_unk_':
# HSTRING # HSTRING
if python_version >= 3:
return '\'%s\'H' % hexlify(self._val[1]).decode('ascii').upper() return '\'%s\'H' % hexlify(self._val[1]).decode('ascii').upper()
else:
return '\'%s\'H' % hexlify(self._val[1]).upper()
else: else:
ident = self._val[0] ident = self._val[0]
Obj = self._get_val_obj(self._val[0]) Obj = self._get_val_obj(self._val[0])

6
pycrate_asn1rt/asnobj_str.py
View File

@ -281,9 +281,6 @@ Specific constraints attributes:
elif self._ASN_WASC and self._val[1] % 8 == 0: elif self._ASN_WASC and self._val[1] % 8 == 0:
# eventually add printable repr # eventually add printable repr
try: try:
if python_version < 3:
s = uint_to_bytes(self._val[0], self._val[1])
else:
s = uint_to_bytes(self._val[0], self._val[1]).decode('ascii') s = uint_to_bytes(self._val[0], self._val[1]).decode('ascii')
if is_printable(s): if is_printable(s):
return ret + ' -- %s --' % repr(s)[1:-1] return ret + ' -- %s --' % repr(s)[1:-1]
@ -1313,10 +1310,7 @@ Specific constraints attributes:
def _to_asn1(self): def _to_asn1(self):
if isinstance(self._val, bytes_types): if isinstance(self._val, bytes_types):
# HSTRING # HSTRING
if python_version >= 3:
ret = '\'%s\'H' % hexlify(self._val).decode('ascii').upper() ret = '\'%s\'H' % hexlify(self._val).decode('ascii').upper()
else:
ret = '\'%s\'H' % hexlify(self._val).upper()
if self._ASN_WASC: if self._ASN_WASC:
# eventually add printable repr # eventually add printable repr
try: try:

13
pycrate_asn1rt/dictobj.py
View File

@ -27,8 +27,6 @@
# *-------------------------------------------------------- # *--------------------------------------------------------
#*/ #*/
from .utils import python_version
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
# ordered dictionnary # ordered dictionnary
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
@ -102,17 +100,6 @@ class ASN1Dict(object):
for key, val in other.items(): for key, val in other.items():
self.__setitem__(key, val) self.__setitem__(key, val)
if python_version <= 2:
def keys(self):
return list(self._index)
def items(self):
return [(k, self._dict[k]) for k in self._index]
def values(self):
return [self._dict[k] for k in self._index]
else:
def keys(self): def keys(self):
return self._index.__iter__() return self._index.__iter__()

2
pycrate_asn1rt/utils.py
View File

@ -39,7 +39,7 @@ from .err import *
from pycrate_asn1c.utils import clean_text from pycrate_asn1c.utils import clean_text
# pycrate_core is used for basic library-wide functions / variables # pycrate_core is used for basic library-wide functions / variables
# (i.e. log(), python_version, integer_types, bytes_types, str_types) # (i.e. log(), integer_types, bytes_types, str_types)
# and for encoding / decoding routines # and for encoding / decoding routines
from pycrate_core.utils import * from pycrate_core.utils import *
from pycrate_core.utils import TYPE_BYTES as T_BYTES from pycrate_core.utils import TYPE_BYTES as T_BYTES

6
pycrate_core/base.py
View File

@ -35,9 +35,6 @@ __all__ = ['Buf', 'BufAuto', 'NullTermStr',
'IntLE', 'Int8LE', 'Int16LE', 'Int24LE', 'Int32LE', 'Int48LE', 'Int64LE'] 'IntLE', 'Int8LE', 'Int16LE', 'Int24LE', 'Int32LE', 'Int48LE', 'Int64LE']
import sys
python_version = sys.version_info[0]
from .utils import * from .utils import *
from .charpy import Charpy, CharpyErr from .charpy import Charpy, CharpyErr
from .elt import Atom, EltErr, REPR_RAW, REPR_HEX, REPR_BIN, REPR_HD, REPR_HUM from .elt import Atom, EltErr, REPR_RAW, REPR_HEX, REPR_BIN, REPR_HD, REPR_HUM
@ -345,9 +342,6 @@ class String(Atom):
# e.g. utf8, utf16, utf32... # e.g. utf8, utf16, utf32...
CODEC = 'utf8' CODEC = 'utf8'
if python_version <= 2:
TYPES = (unicode, )
else:
TYPES = (str, ) TYPES = (str, )
TYPENAMES = get_typenames(*TYPES) TYPENAMES = get_typenames(*TYPES)
DEFAULT_VAL = u'' DEFAULT_VAL = u''

9
pycrate_core/charpy.py
View File

@ -150,14 +150,8 @@ class Charpy(object):
# bytes buffer, default one # bytes buffer, default one
r = self.to_bytes() r = self.to_bytes()
if len(r) > self._REPR_MAX: if len(r) > self._REPR_MAX:
if python_version < 3:
return 'charpy(b{0}...{1})'.format(
repr(r[0:self._REPR_MAX])[:-1], repr(r[-2:])[1:])
else:
return 'charpy({0}...{1})'.format( return 'charpy({0}...{1})'.format(
repr(r[0:self._REPR_MAX])[:-1], repr(r[-2:])[2:]) repr(r[0:self._REPR_MAX])[:-1], repr(r[-2:])[2:])
elif python_version < 3:
return 'charpy(b{0})'.format(repr(r))
else: else:
return 'charpy({0})'.format(repr(r)) return 'charpy({0})'.format(repr(r))
elif self._REPR == 'bytelist': elif self._REPR == 'bytelist':
@ -1326,9 +1320,6 @@ class Charpy(object):
__len__ = len_bit __len__ = len_bit
__repr__ = repr __repr__ = repr
__index__ = to_uint __index__ = to_uint
if python_version < 3:
__str__ = to_bytes
else:
__bytes__ = to_bytes __bytes__ = to_bytes
def __bool__(self): def __bool__(self):

35
pycrate_core/elt.py
View File

@ -72,17 +72,7 @@ REPR_HUM = 4
# for hexdump representation # for hexdump representation
if python_version < 3: def hview(buf, lw=16):
def hview(buf, lw=16):
hv = []
for o in range(0, len(buf), lw):
l = buf[o:o+lw]
# create the hex fmt string for each iteration
hs = '%.2x ' * len(l) % tuple(map(ord, l))
hv.append( ' ' + hs + ' '*(3*lw-len(hs)) + '| %r' % l )
return hv
else:
def hview(buf, lw=16):
hv = [] hv = []
for o in range(0, len(buf), lw): for o in range(0, len(buf), lw):
l = buf[o:o+lw] l = buf[o:o+lw]
@ -750,9 +740,6 @@ class Element(object):
b = self.to_bytes() b = self.to_bytes()
return bytes_to_int(b, len(b)<<3) return bytes_to_int(b, len(b)<<3)
if python_version < 3:
__str__ = to_bytes
else:
__bytes__ = to_bytes __bytes__ = to_bytes
#--------------------------------------------------------------------------# #--------------------------------------------------------------------------#
@ -2123,11 +2110,6 @@ class Envelope(Element):
Returns: Returns:
None None
""" """
if python_version < 3:
del self._content[:]
del self._by_id[:]
del self._by_name[:]
else:
self._content.clear() self._content.clear()
self._by_id.clear() self._by_id.clear()
self._by_name.clear() self._by_name.clear()
@ -2156,9 +2138,6 @@ class Envelope(Element):
# transparent element, pass it and try the next one # transparent element, pass it and try the next one
return self.__next__() return self.__next__()
if python_version < 3:
next = __next__
def __getitem__(self, key): def __getitem__(self, key):
if isinstance(key, str_types): if isinstance(key, str_types):
try: try:
@ -3041,9 +3020,6 @@ class Array(Element):
Returns: Returns:
None None
""" """
if python_version < 3:
del self._val[:]
else:
self._val.clear() self._val.clear()
def __iter__(self): def __iter__(self):
@ -3065,9 +3041,6 @@ class Array(Element):
clone._env = self clone._env = self
return clone return clone
if python_version < 3:
next = __next__
def __getitem__(self, key): def __getitem__(self, key):
if isinstance(key, integer_types): if isinstance(key, integer_types):
try: try:
@ -3979,9 +3952,6 @@ class Sequence(Element):
Returns: Returns:
None None
""" """
if python_version < 3:
del self._content[:]
else:
self._content.clear() self._content.clear()
def __iter__(self): def __iter__(self):
@ -4008,9 +3978,6 @@ class Sequence(Element):
# transparent element, pass it and try the next one # transparent element, pass it and try the next one
return self.__next__() return self.__next__()
if python_version < 3:
next = __next__
def __getitem__(self, key): def __getitem__(self, key):
if isinstance(key, integer_types): if isinstance(key, integer_types):
try: try:

5
pycrate_core/repr.py
View File

@ -29,10 +29,7 @@
# #
import sys import sys
if sys.version_info[0] < 3: import builtins
import __builtin__ as builtins
else:
import builtins
from .elt import Element from .elt import Element
from .charpy import Charpy from .charpy import Charpy

6
pycrate_core/utils.py
View File

@ -28,12 +28,8 @@
#*/ #*/
import sys import sys
from .utils_py3 import *
if sys.version_info[0] < 3:
from .utils_py2 import *
else:
from .utils_py3 import *
#
# configure max recursion # configure max recursion
#sys.setrecursionlimit(200) #sys.setrecursionlimit(200)

63
pycrate_corenet/ServerGTPU.py
View File

@ -944,20 +944,7 @@ class _DPI(object):
return unpack('!H', pay[2:4])[0] return unpack('!H', pay[2:4])[0]
@staticmethod @staticmethod
def __get_dn_req_py2(req): def __get_dn_req(req):
"""return the DNS name requested
"""
# remove fixed DNS header and Type / Class
s = req[12:-4]
n = []
while len(s) > 1:
l = ord(s[0])
n.append( s[1:1+l] )
s = s[1+l:]
return b'.'.join(n)
@staticmethod
def __get_dn_req_py3(req):
"""return the DNS name requested """return the DNS name requested
""" """
# remove fixed DNS header and Type / Class # remove fixed DNS header and Type / Class
@ -969,30 +956,11 @@ class _DPI(object):
s = s[1+l:] s = s[1+l:]
return b'.'.join(n) return b'.'.join(n)
if python_version < 3:
get_dn_req = __get_dn_req_py2
else:
get_dn_req = __get_dn_req_py3
class DPIv4(_DPI): class DPIv4(_DPI):
@staticmethod @staticmethod
def __get_ip_info_py2(ipbuf): def __get_ip_info(ipbuf):
"""return a 3-tuple: ipdst (asc), protocol (uint), payload (bytes)
"""
# returns a 3-tuple: dst IP, protocol, payload buffer
# get IP header length
l = (ord(ipbuf[0]) & 0x0F) * 4
# get dst IP
dst = inet_ntoa(ipbuf[16:20])
# get protocol
prot = ord(ipbuf[9])
#
return (dst, prot, ipbuf[l:])
@staticmethod
def __get_ip_info_py3(ipbuf):
"""return a 3-tuple: ipdst (asc), protocol (uint), payload (bytes) """return a 3-tuple: ipdst (asc), protocol (uint), payload (bytes)
""" """
# returns a 3-tuple: dst IP, protocol, payload buffer # returns a 3-tuple: dst IP, protocol, payload buffer
@ -1005,31 +973,11 @@ class DPIv4(_DPI):
# #
return (dst, prot, ipbuf[l:]) return (dst, prot, ipbuf[l:])
if python_version < 3:
get_ip_info = __get_ip_info_py2
else:
get_ip_info = __get_ip_info_py3
class DPIv6(_DPI): class DPIv6(_DPI):
@staticmethod @staticmethod
def __get_ip_info_py2(ipbuf): def __get_ip_info(ipbuf):
"""return a 3-tuple: ipdst (asc), protocol (uint), payload (bytes)
"""
# returns a 3-tuple: dst IP, protocol, payload buffer
# get payload length
pl = unpack('>H', ipbuf[4:6])[0]
# get dst IP
dst = inet_ntop(AF_INET6, ipbuf[24:40])
# get protocol
# TODO: unstack IPv6 opts
prot = ord(ipbuf[6])
#
return (dst, prot, ipbuf[-pl:])
@staticmethod
def __get_ip_info_py3(ipbuf):
"""return a 3-tuple: ipdst (asc), protocol (uint), payload (bytes) """return a 3-tuple: ipdst (asc), protocol (uint), payload (bytes)
""" """
# returns a 3-tuple: dst IP, protocol, payload buffer # returns a 3-tuple: dst IP, protocol, payload buffer
@ -1043,11 +991,6 @@ class DPIv6(_DPI):
# #
return (dst, prot, ipbuf[-pl:]) return (dst, prot, ipbuf[-pl:])
if python_version < 3:
get_ip_info = __get_ip_info_py2
else:
get_ip_info = __get_ip_info_py3
class MOD(object): class MOD(object):
# This is a skeleton for GTP-U payloads specific handler. # This is a skeleton for GTP-U payloads specific handler.

5
pycrate_corenet/ServerSMS.py
View File

@ -30,11 +30,8 @@
__all__ = ['SMSd'] __all__ = ['SMSd']
from time import localtime from time import localtime
from queue import Queue, Empty, Full
from .utils import * from .utils import *
if python_version < 3:
from Queue import Queue, Empty, Full
else:
from queue import Queue, Empty, Full
class SMSd(object): class SMSd(object):

5
pycrate_ether/IP.py
View File

@ -31,7 +31,7 @@ from socket import inet_aton, inet_ntoa, inet_pton, inet_ntop, AF_INET, AF_INET6
from struct import pack from struct import pack
from array import array from array import array
from pycrate_core.utils import reverse_dict, log, python_version, str_types from pycrate_core.utils import reverse_dict, log, str_types
from pycrate_core.elt import Envelope, Sequence, REPR_RAW, REPR_HEX, REPR_BIN, REPR_HUM from pycrate_core.elt import Envelope, Sequence, REPR_RAW, REPR_HEX, REPR_BIN, REPR_HUM
from pycrate_core.base import * from pycrate_core.base import *
from pycrate_core.repr import * from pycrate_core.repr import *
@ -105,8 +105,7 @@ class IPAddr(Buf):
return val return val
def set_val(self, val): def set_val(self, val):
if python_version == 2 and isinstance(val, unicode) \ if isinstance(val, str_types):
or python_version > 2 and isinstance(val, str_types):
self.encode(val) self.encode(val)
else: else:
Buf.set_val(self, val) Buf.set_val(self, val)

6
pycrate_mobile/ISUP.py
View File

@ -3987,12 +3987,6 @@ def parse_ISUP(buf):
""" """
if len(buf) < 3: if len(buf) < 3:
return None, 1 return None, 1
if python_version < 3:
try:
Msg = ISUPTypeClasses[ord(buf[2])]()
except:
return None, 1
else:
try: try:
Msg = ISUPTypeClasses[buf[2]]() Msg = ISUPTypeClasses[buf[2]]()
except: except:

19
pycrate_mobile/NAS.py
View File

@ -28,8 +28,6 @@
#*/ #*/
from pycrate_core.utils import * from pycrate_core.utils import *
if python_version < 3:
from struct import unpack
from .TS24008_IE import * from .TS24008_IE import *
from .TS24008_MM import * from .TS24008_MM import *
@ -103,13 +101,6 @@ def parse_NAS_MO(buf, inner=True):
element: Element instance, if err is null (no error) element: Element instance, if err is null (no error)
element: None, if err is not null (standard NAS error code) element: None, if err is not null (standard NAS error code)
""" """
if python_version < 3:
try:
pd, type = unpack('>BB', buf[:2])
except Exception:
# error 111, unspecified protocol error
return None, 111
else:
try: try:
pd, type = buf[0], buf[1] pd, type = buf[0], buf[1]
except Exception: except Exception:
@ -155,16 +146,6 @@ def parse_NAS_MT(buf, inner=True, wl2=False):
element: Element instance, if err is null (no error) element: Element instance, if err is null (no error)
element: None, if err is not null (standard NAS error code) element: None, if err is not null (standard NAS error code)
""" """
if python_version < 3:
try:
if wl2:
pd, type = unpack('>BB', buf[1:3])
else:
pd, type = unpack('>BB', buf[:2])
except Exception:
# error 111, unspecified protocol error
return None, 111
else:
try: try:
if wl2: if wl2:
pd, type = buf[1], buf[2] pd, type = buf[1], buf[2]

3
pycrate_mobile/NAS5G.py
View File

@ -94,9 +94,6 @@ def parse_NAS5G(buf, inner=True, sec_hdr=True):
elif pd == 46: elif pd == 46:
# 5GSM # 5GSM
try: try:
if python_version < 3:
typ = ord(buf[3:4])
else:
typ = buf[3] typ = buf[3]
except: except:
# error 111, unspecified protocol error # error 111, unspecified protocol error

38
pycrate_mobile/NASLTE.py
View File

@ -51,13 +51,6 @@ def parse_NASLTE_MO(buf, inner=True, sec_hdr=True):
element: Element instance, if err is null (no error) element: Element instance, if err is null (no error)
element: None, if err is not null (standard LTE NAS error code) element: None, if err is not null (standard LTE NAS error code)
""" """
if python_version < 3:
try:
pd = ord(buf[:1])
except Exception:
# error 111, unspecified protocol error
return None, 111
else:
try: try:
pd = buf[0] pd = buf[0]
except Exception: except Exception:
@ -98,12 +91,6 @@ def parse_NASLTE_MO(buf, inner=True, sec_hdr=True):
# #
if pd == 7: if pd == 7:
# EMM # EMM
if python_version < 3:
try:
typ = ord(buf[1:2])
except Exception:
return None, 111
else:
try: try:
typ = buf[1] typ = buf[1]
except Exception: except Exception:
@ -115,12 +102,6 @@ def parse_NASLTE_MO(buf, inner=True, sec_hdr=True):
return None, 97 return None, 97
elif pd == 2: elif pd == 2:
# ESM # ESM
if python_version < 3:
try:
typ = ord(buf[2:3])
except Exception:
return None, 111
else:
try: try:
typ = buf[2] typ = buf[2]
except Exception: except Exception:
@ -184,13 +165,6 @@ def parse_NASLTE_MT(buf, inner=True, sec_hdr=True):
element: Element instance, if err is null (no error) element: Element instance, if err is null (no error)
element: None, if err is not null (standard LTE NAS error code) element: None, if err is not null (standard LTE NAS error code)
""" """
if python_version < 3:
try:
pd = ord(buf[0])
except Exception:
# error 111, unspecified protocol error
return None, 111
else:
try: try:
pd = buf[0] pd = buf[0]
except Exception: except Exception:
@ -231,12 +205,6 @@ def parse_NASLTE_MT(buf, inner=True, sec_hdr=True):
# #
if pd == 7: if pd == 7:
# EMM # EMM
if python_version < 3:
try:
typ = ord(buf[1])
except Exception:
return None, 111
else:
try: try:
typ = buf[1] typ = buf[1]
except Exception: except Exception:
@ -248,12 +216,6 @@ def parse_NASLTE_MT(buf, inner=True, sec_hdr=True):
return None, 97 return None, 97
elif pd == 2: elif pd == 2:
# ESM # ESM
if python_version < 3:
try:
typ = ord(buf[2])
except Exception:
return None, 111
else:
try: try:
typ = buf[2] typ = buf[2]
except Exception: except Exception:

12
pycrate_mobile/SCCP.py
View File

@ -1568,12 +1568,6 @@ def parse_SCCP(buf, w_scmg=True):
""" """
if not buf: if not buf:
return None, 1 return None, 1
if python_version < 3:
try:
Msg = SCCPTypeClasses[ord(buf[0])]()
except:
return None, 1
else:
try: try:
Msg = SCCPTypeClasses[buf[0]]() Msg = SCCPTypeClasses[buf[0]]()
except: except:
@ -1614,12 +1608,6 @@ def parse_SCMG(buf):
""" """
if not buf: if not buf:
return None, 1 return None, 1
if python_version < 3:
try:
Msg = SCMGTypeClasses[ord(buf[0])]()
except:
return None, 1
else:
try: try:
Msg = SCMGTypeClasses[buf[0]]() Msg = SCMGTypeClasses[buf[0]]()
except: except:

3
pycrate_mobile/TS0960_GTPv0.py
View File

@ -1880,9 +1880,6 @@ def parse_GTPv0(buf):
""" """
if len(buf) < 20: if len(buf) < 20:
return None, ERR_GTP_BUF_TOO_SHORT return None, ERR_GTP_BUF_TOO_SHORT
if python_version < 3:
typ = ord(buf[1])
else:
typ = buf[1] typ = buf[1]
try: try:
Msg = GTPv0Dispatcher[typ]() Msg = GTPv0Dispatcher[typ]()

8
pycrate_mobile/TS23038.py
View File

@ -44,7 +44,7 @@ __all__ = [
# release 13 (d00) # release 13 (d00)
#------------------------------------------------------------------------------# #------------------------------------------------------------------------------#
from pycrate_core.utils import python_version, pack_val, TYPE_UINT, PycrateErr from pycrate_core.utils import pack_val, TYPE_UINT, PycrateErr
from pycrate_core.charpy import Charpy from pycrate_core.charpy import Charpy
from pycrate_core.elt import Envelope from pycrate_core.elt import Envelope
from pycrate_core.base import Uint from pycrate_core.base import Uint
@ -574,9 +574,6 @@ def encode_7b(txt, off=0):
# check the length in bits and add padding bits # check the length in bits and add padding bits
pad = ((8-(7*len(arr)+off)%8)%8) pad = ((8-(7*len(arr)+off)%8)%8)
arr.insert(0, (TYPE_UINT, 0, pad)) arr.insert(0, (TYPE_UINT, 0, pad))
if python_version < 3:
return ''.join(reversed(pack_val(*arr)[0])), cnt
else:
return bytes(reversed(pack_val(*arr)[0])), cnt return bytes(reversed(pack_val(*arr)[0])), cnt
@ -590,9 +587,6 @@ def decode_7b(buf, off=0):
Returns: Returns:
decoded text string (utf8 str) decoded text string (utf8 str)
""" """
if python_version < 3:
char = Charpy(''.join(reversed(buf)))
else:
char = Charpy(bytes(reversed(buf))) char = Charpy(bytes(reversed(buf)))
# jump over the padding bits # jump over the padding bits
# WNG: in case of 7 bits padding, we will have an @ at the end # WNG: in case of 7 bits padding, we will have an @ at the end

23
pycrate_mobile/TS24008_IE.py
View File

@ -80,8 +80,6 @@ def encode_bcd(dig):
def decode_bcd(buf): def decode_bcd(buf):
if python_version < 3:
buf = [ord(c) for c in buf]
ret = [] ret = []
for o in buf: for o in buf:
msb, lsb = o>>4, o&0xf msb, lsb = o>>4, o&0xf
@ -162,9 +160,6 @@ class BufBCD(Buf):
def decode(self): def decode(self):
"""returns the encoded string of digits """returns the encoded string of digits
""" """
if python_version < 3:
num = [ord(c) for c in self.get_val()]
else:
num = self.get_val() num = self.get_val()
ret = [] ret = []
for o in num: for o in num:
@ -192,9 +187,6 @@ class BufBCD(Buf):
if len(ret) % 2: if len(ret) % 2:
ret.append( self._filler ) ret.append( self._filler )
# #
if python_version < 3:
self._val = ''.join([chr(c) for c in map(lambda x,y:x+(y<<4), ret[::2], ret[1::2])])
else:
self._val = bytes(map(lambda x,y:x+(y<<4), ret[::2], ret[1::2])) self._val = bytes(map(lambda x,y:x+(y<<4), ret[::2], ret[1::2]))
def repr(self): def repr(self):
@ -288,21 +280,6 @@ class PLMN(Buf):
"""returns the encoded string of digits """returns the encoded string of digits
""" """
plmn = [] plmn = []
if python_version < 3:
for c in self.get_val():
b = ord(c)
plmn.append(b>>4)
plmn.append(b&0xf)
try:
if plmn[2] == 0xf:
return u'%i%i%i%i%i' % (plmn[1], plmn[0], plmn[3], plmn[5], plmn[4])
else:
return u'%i%i%i%i%i%i' % (plmn[1], plmn[0], plmn[3], plmn[5], plmn[4], plmn[2])
except IndexError:
# an invalid value has been set, _SAFE_STAT / DYN is probably disabled
# for e.g. fuzzing purpose, but there is still need to not break here
return '0x%s' % hexlify(self.to_bytes()).decode('ascii')
else:
for b in self.get_val(): for b in self.get_val():
plmn.append(b>>4) plmn.append(b>>4)
plmn.append(b&0xf) plmn.append(b&0xf)

6
pycrate_mobile/TS29060_GTP.py
View File

@ -5449,9 +5449,6 @@ def parse_GTP_SGSN(buf):
""" """
if len(buf) < 8: if len(buf) < 8:
return None, ERR_GTP_BUF_TOO_SHORT return None, ERR_GTP_BUF_TOO_SHORT
if python_version < 3:
typ = ord(buf[1])
else:
typ = buf[1] typ = buf[1]
try: try:
Msg = GTPDispatcherSGSN[typ]() Msg = GTPDispatcherSGSN[typ]()
@ -5484,9 +5481,6 @@ def parse_GTP_GGSN(buf):
""" """
if len(buf) < 8: if len(buf) < 8:
return None, ERR_GTP_BUF_TOO_SHORT return None, ERR_GTP_BUF_TOO_SHORT
if python_version < 3:
typ = ord(buf[1])
else:
typ = buf[1] typ = buf[1]
try: try:
Msg = GTPDispatcherGGSN[typ]() Msg = GTPDispatcherGGSN[typ]()

3
pycrate_mobile/TS29244_PFCP.py
View File

@ -6073,9 +6073,6 @@ def parse_PFCP(buf):
""" """
if len(buf) < 8: if len(buf) < 8:
return None, ERR_PFCP_BUF_TOO_SHORT return None, ERR_PFCP_BUF_TOO_SHORT
if python_version < 3:
typ = ord(buf[1])
else:
typ = buf[1] typ = buf[1]
try: try:
Msg = PFCPDispatcher[typ]() Msg = PFCPDispatcher[typ]()

7
pycrate_mobile/TS29274_GTPC.py
View File

@ -7587,12 +7587,9 @@ def parse_GTPC(buf):
""" """
if len(buf) < 8: if len(buf) < 8:
return None, ERR_GTPC_BUF_TOO_SHORT return None, ERR_GTPC_BUF_TOO_SHORT
if python_version < 3: typ = buf[1]
type = ord(buf[1])
else:
type = buf[1]
try: try:
Msg = GTPCDispatcher[type]() Msg = GTPCDispatcher[typ]()
except KeyError: except KeyError:
return None, ERR_GTPC_TYPE_NONEXIST return None, ERR_GTPC_TYPE_NONEXIST
try: try:

7
pycrate_mobile/TS29281_GTPU.py
View File

@ -416,12 +416,9 @@ def parse_GTPU(buf):
""" """
if len(buf) < 8: if len(buf) < 8:
return None, ERR_GTPU_BUF_TOO_SHORT return None, ERR_GTPU_BUF_TOO_SHORT
if python_version < 3: typ = buf[1]
type = ord(buf[1])
else:
type = buf[1]
try: try:
Msg = GTPUDispatcher[type]() Msg = GTPUDispatcher[typ]()
except KeyError: except KeyError:
return None, ERR_GTPU_TYPE_NONEXIST return None, ERR_GTPU_TYPE_NONEXIST
try: try:

3
pycrate_mobile/TS44018_RR.py
View File

@ -737,10 +737,7 @@ class RRHandoverFailure(Layer3):
def get_tbf(l3msg): def get_tbf(l3msg):
v = l3msg[2][0].get_val() v = l3msg[2][0].get_val()
if isinstance(v, str_types): if isinstance(v, str_types):
if python_version:
return v[0] & 1 return v[0] & 1
else:
return ord(v[0]) & 1
elif isinstance(v, list): elif isinstance(v, list):
return v[-1] return v[-1]
else: else:

10
setup.py
View File

@ -8,14 +8,6 @@ from setuptools import setup, find_packages
VERSION = "0.5.5" VERSION = "0.5.5"
# get dependencies according to the Python version
if sys.version_info[0] == 2:
# Python2 requires enum34
install_reqs = ['enum34']
else:
install_reqs = []
# get long description from the README.md # get long description from the README.md
with open(os.path.join(os.path.dirname(__file__), "README.md")) as fd: with open(os.path.join(os.path.dirname(__file__), "README.md")) as fd:
long_description = fd.read() long_description = fd.read()
@ -56,7 +48,7 @@ setup(
], ],
# potential dependencies # potential dependencies
install_requires=install_reqs, install_requires=[],
# optional dependencies # optional dependencies
extras_require={ extras_require={

6
test/test_core.py
View File

@ -387,9 +387,6 @@ def test_elt_2():
t['res'].set_val(0) t['res'].set_val(0)
t['L'].set_val(t['V'].get_bl()) t['L'].set_val(t['V'].get_bl())
if python_version < 3:
assert( repr(t) == "<TestTLV : <T [Tag] : 0b00000010 (Tag2)><F1 [Flag1] : 1><F2 [Flag2] : 1><res [Reserved] : 0><L [Length] : 104><V [Value] : 'default value'>>" )
else:
assert( repr(t) == "<TestTLV : <T [Tag] : 0b00000010 (Tag2)><F1 [Flag1] : 1><F2 [Flag2] : 1><res [Reserved] : 0><L [Length] : 104><V [Value] : b'default value'>>" ) assert( repr(t) == "<TestTLV : <T [Tag] : 0b00000010 (Tag2)><F1 [Flag1] : 1><F2 [Flag2] : 1><res [Reserved] : 0><L [Length] : 104><V [Value] : b'default value'>>" )
if _with_json: if _with_json:
@ -400,9 +397,6 @@ def test_elt_2():
t.from_json(jso) t.from_json(jso)
assert( t._to_jval() == jv ) assert( t._to_jval() == jv )
if python_version < 3:
assert( repr(t) == "<TestTLV : <T [Tag] : 0b00000010 (Tag2)><F1 [Flag1] : 1><F2 [Flag2] : 1><res [Reserved] : 0><L [Length] : 104><V [Value] : 'default value'>>" )
else:
assert( repr(t) == "<TestTLV : <T [Tag] : 0b00000010 (Tag2)><F1 [Flag1] : 1><F2 [Flag2] : 1><res [Reserved] : 0><L [Length] : 104><V [Value] : b'default value'>>" ) assert( repr(t) == "<TestTLV : <T [Tag] : 0b00000010 (Tag2)><F1 [Flag1] : 1><F2 [Flag2] : 1><res [Reserved] : 0><L [Length] : 104><V [Value] : b'default value'>>" )