christofsteel/wix-on-linux
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Migrate Python code to Python 3.

Browse source
This commit is contained in:
Simon Tatham 2020-08-26 21:13:29 +01:00
parent 1c1c3850e8
commit 558d8cf7cd
2 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
makecab.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
import sys import sys
import os import os
@ -10,7 +10,7 @@ from collections import namedtuple
CFHEADER_s = struct.Struct("<4sLLLLLBBHHHHH") CFHEADER_s = struct.Struct("<4sLLLLLBBHHHHH")
CFHEADER = namedtuple("CFHEADER", "sig res0 size res1 firstfile res2 " CFHEADER = namedtuple("CFHEADER", "sig res0 size res1 firstfile res2 "
"verminor vermajor folders files flags setid icabinet") "verminor vermajor folders files flags setid icabinet")
CFHEADER_sig = "MSCF" CFHEADER_sig = b"MSCF"
CFFOLDER_s = struct.Struct("<LHH") CFFOLDER_s = struct.Struct("<LHH")
CFFOLDER = namedtuple("CFFOLDER", "firstdata ndata compresstype") CFFOLDER = namedtuple("CFFOLDER", "firstdata ndata compresstype")
@ -26,7 +26,7 @@ def mszip(data):
zlib.DEF_MEM_LEVEL, zlib.Z_DEFAULT_STRATEGY) zlib.DEF_MEM_LEVEL, zlib.Z_DEFAULT_STRATEGY)
compressed = compressor.compress(data) compressed = compressor.compress(data)
compressed += compressor.flush() compressed += compressor.flush()
return "CK" + compressed # add MSZIP header return b"CK" + compressed # add MSZIP header
def packdate(y,m,d): def packdate(y,m,d):
return ((y - 1980) << 9) | (m << 5) | d return ((y - 1980) << 9) | (m << 5) | d
@ -34,19 +34,20 @@ def packtime(h,m,s):
return ((h << 11) | (m << 5) | (s >> 1)) return ((h << 11) | (m << 5) | (s >> 1))
def checksum(data): def checksum(data):
data_full_words = data[:len(data) & ~3] data_fullwords_len = len(data) & ~3
data_last_word = data[len(data_full_words):] data_last_word = data[data_fullwords_len:]
data_last_word = "".join(reversed(data_last_word)) data_last_word = bytes(reversed(data_last_word))
data_last_word += "\0" * (3 & -len(data)) # pad to multiple of 4 bytes data_last_word += b"\0" * (3 & -len(data)) # pad to multiple of 4 bytes
data = data_full_words + data_last_word
toret = 0 toret = 0
for offset in xrange(0, len(data), 4): for part, partlen in ((data, data_fullwords_len),
toret ^= struct.unpack_from("<L", data, offset)[0] (data_last_word, len(data_last_word))):
for offset in range(0, partlen, 4):
toret ^= struct.unpack_from("<L", part, offset)[0]
return toret return toret
def build_cab(files): def build_cab(files):
uncompressed_data = "" uncompressed_data = b""
fileheaders = "" fileheaders = b""
for name, data, mtime in files: for name, data, mtime in files:
mtime_u = time.gmtime(mtime) mtime_u = time.gmtime(mtime)
fileheader = CFFILE( fileheader = CFFILE(
@ -54,9 +55,10 @@ def build_cab(files):
date=packdate(mtime_u.tm_year, mtime_u.tm_mon, mtime_u.tm_mday), date=packdate(mtime_u.tm_year, mtime_u.tm_mon, mtime_u.tm_mday),
time=packtime(mtime_u.tm_hour, mtime_u.tm_min, mtime_u.tm_sec)) time=packtime(mtime_u.tm_hour, mtime_u.tm_min, mtime_u.tm_sec))
uncompressed_data += data uncompressed_data += data
fileheaders += CFFILE_s.pack(*fileheader) + name + "\0" fileheaders += CFFILE_s.pack(*fileheader)
fileheaders += name.encode("ASCII") + b"\0"
compressed_data = "" compressed_data = b""
offset = 0 offset = 0
n_data_blocks = 0 n_data_blocks = 0
while offset < len(uncompressed_data): while offset < len(uncompressed_data):

2
wrapper.py
View file

@ -1,4 +1,4 @@
#!/usr/bin/env python #!/usr/bin/env python3
import sys import sys
import os import os