3party/pugixml
0
0
Fork 0
mirror of https://github.com/zeux/pugixml.git synced 2024-12-27 13:33:17 +08:00
Code Issues Projects Releases Wiki Activity

scripts: Convert archive.py to Python 3

Browse Source 
The changes are mostly mechanically converting str to bytes.
This commit is contained in:
Arseny Kapoulkine 2020-11-26 01:08:07 -08:00
parent a3ae05cc9f
commit 7a9da11d8b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -77,7 +77,7 @@ docs: docs/quickstart.html docs/manual.html
build/pugixml-%: .FORCE | $(RELEASE) build/pugixml-%: .FORCE | $(RELEASE)
@mkdir -p $(BUILD) @mkdir -p $(BUILD)
TIMESTAMP=`git show v$(VERSION) -s --format=%ct` && python scripts/archive.py $@ pugixml-$(VERSION) $$TIMESTAMP $| TIMESTAMP=`git show v$(VERSION) -s --format=%ct` && python3 scripts/archive.py $@ pugixml-$(VERSION) $$TIMESTAMP $|
$(EXECUTABLE): $(OBJECTS) $(EXECUTABLE): $(OBJECTS)
$(CXX) $(OBJECTS) $(LDFLAGS) -o $@ $(CXX) $(OBJECTS) $(LDFLAGS) -o $@

12
scripts/archive.py
View File

@ -1,18 +1,18 @@
import io
import os.path import os.path
import sys import sys
import tarfile import tarfile
import time import time
import zipfile import zipfile
import StringIO
def read_file(path, use_crlf): def read_file(path, use_crlf):
with open(path, 'rb') as file: with open(path, 'rb') as file:
data = file.read() data = file.read()
if '\0' not in data: if b'\0' not in data:
data = data.replace('\r', '') data = data.replace(b'\r', b'')
if use_crlf: if use_crlf:
data = data.replace('\n', '\r\n') data = data.replace(b'\n', b'\r\n')
return data return data
@ -24,7 +24,7 @@ def write_zip(target, arcprefix, timestamp, sources):
info = zipfile.ZipInfo(path) info = zipfile.ZipInfo(path)
info.date_time = time.localtime(timestamp) info.date_time = time.localtime(timestamp)
info.compress_type = zipfile.ZIP_DEFLATED info.compress_type = zipfile.ZIP_DEFLATED
info.external_attr = 0644 << 16L info.external_attr = 0o644 << 16
archive.writestr(info, data) archive.writestr(info, data)
def write_tar(target, arcprefix, timestamp, sources, compression): def write_tar(target, arcprefix, timestamp, sources, compression):
@ -35,7 +35,7 @@ def write_tar(target, arcprefix, timestamp, sources, compression):
info = tarfile.TarInfo(path) info = tarfile.TarInfo(path)
info.size = len(data) info.size = len(data)
info.mtime = timestamp info.mtime = timestamp
archive.addfile(info, StringIO.StringIO(data)) archive.addfile(info, io.BytesIO(data))
if len(sys.argv) < 5: if len(sys.argv) < 5:
raise RuntimeError('Usage: python archive.py <target> <archive prefix> <timestamp> <source files>') raise RuntimeError('Usage: python archive.py <target> <archive prefix> <timestamp> <source files>')