From af46e67fc758483718a3c5c21f0efbd74273dfa1 Mon Sep 17 00:00:00 2001 From: Petri Savolainen Date: Sat, 28 Nov 2020 16:52:29 +0200 Subject: [PATCH] implement #95 --- HISTORY.rst | 1 + tnefparse/util.py | 38 -------------------------------------- 2 files changed, 1 insertion(+), 38 deletions(-) diff --git a/HISTORY.rst b/HISTORY.rst index 3a0aa20..08af269 100644 --- a/HISTORY.rst +++ b/HISTORY.rst @@ -6,6 +6,7 @@ tnefparse 1.4.0 (unreleased) - drop Python 3.5 support (jugmac00) - add Python 3.9 support (jugmac00) - introduce using type annotations (jugmac00) +- remove deprecated parseFile & raw_mapi functions tnefparse 1.3.1 (2020-09-30) ============================= diff --git a/tnefparse/util.py b/tnefparse/util.py index 165c8b3..bf69351 100644 --- a/tnefparse/util.py +++ b/tnefparse/util.py @@ -67,41 +67,3 @@ def bytes_to_int(byte_arr): def checksum(data): return sum(bytearray(data)) & 0xFFFF - - -def raw_mapi(dataLen, data): - "debug raw MAPI data when decoding MAPI types" - warnings.warn("raw_mapi will be deprecated after 1.3", DeprecationWarning) - loop = 0 - logger.debug("Raw MAPI Data:") - while loop <= dataLen: - if (loop + 16) < dataLen: - logger.debug( - "%2.2x%2.2x %2.2x%2.2x %2.2x%2.2x %2.2x%2.2x %2.2x%2.2x %2.2x%2.2x %2.2x%2.2x %2.2x%2.2x", - ord(data[loop]), - ord(data[loop + 1]), - ord(data[loop + 2]), - ord(data[loop + 3]), - ord(data[loop + 4]), - ord(data[loop + 5]), - ord(data[loop + 6]), - ord(data[loop + 7]), - ord(data[loop + 8]), - ord(data[loop + 9]), - ord(data[loop + 10]), - ord(data[loop + 11]), - ord(data[loop + 12]), - ord(data[loop + 13]), - ord(data[loop + 14]), - ord(data[loop + 15]), - ) - loop += 16 - loop -= 16 - q, r = divmod(dataLen, 16) - strList = [] - for i in range(r): - subq, subr = divmod(i, 2) - if i != 0 and subr == 0: - strList.append(' ') - strList.append('%2.2x' % ord(data[loop + i])) - logger.debug(''.join(strList))