jinx/pyinstxtractor
1
Fork 0
mirror of https://github.com/extremecoders-re/pyinstxtractor.git synced 2025-08-02 16:24:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Use importlib instead of imp for Python3

Browse Source
This commit is contained in:
extremecoders-re
2020-03-27 14:55:19 +05:30
parent cc379e0baa
commit 176b157245
1 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pyinstxtractor.py
View File

@@ -89,9 +89,16 @@ import struct
import marshal import marshal
import zlib import zlib
import sys import sys
import imp
from uuid import uuid4 as uniquename from uuid import uuid4 as uniquename
# imp is deprecated in Python 2 in favour of importlib
if sys.version_info.major == 3:
import importlib
pyc_magic = importlib.util.MAGIC_NUMBER
else:
import imp
pyc_magic = imp.get_magic()
class CTOCEntry: class CTOCEntry:
def __init__(self, position, cmprsdDataSize, uncmprsdDataSize, cmprsFlag, typeCmprsData, name): def __init__(self, position, cmprsdDataSize, uncmprsdDataSize, cmprsFlag, typeCmprsData, name):
@@ -269,7 +276,7 @@ class PyInstArchive:
def _writePyc(self, filename, data): def _writePyc(self, filename, data):
with open(filename, 'wb') as pycFile: with open(filename, 'wb') as pycFile:
pycFile.write(imp.get_magic()) # pyc magic pycFile.write(pyc_magic) # pyc magic
if self.pyver >= 37: # PEP 552 -- Deterministic pycs if self.pyver >= 37: # PEP 552 -- Deterministic pycs
pycFile.write(b'\0' * 4) # Bitfield pycFile.write(b'\0' * 4) # Bitfield
@@ -296,7 +303,7 @@ class PyInstArchive:
pycHeader = f.read(4) # Python magic value pycHeader = f.read(4) # Python magic value
# Skip PYZ extraction if not running under the same python version # Skip PYZ extraction if not running under the same python version
if imp.get_magic() != pycHeader: if pyc_magic != pycHeader:
print('[!] Warning: This script is running in a different Python version than the one used to build the executable.') print('[!] Warning: This script is running in a different Python version than the one used to build the executable.')
print('[!] Please run this script in Python{0} to prevent extraction errors during unmarshalling'.format(self.pyver)) print('[!] Please run this script in Python{0} to prevent extraction errors during unmarshalling'.format(self.pyver))
print('[!] Skipping pyz extraction') print('[!] Skipping pyz extraction')