Skip to content

Commit a0c00ff

Browse files
committed
Merge #20298: macOS deploy: use the new plistlib API
04a69c2 macOS deploy: use the new plistlib API (Jonas Schnelli) Pull request description: See https://docs.python.org/3/library/plistlib.html. The old API was deprecated in 3.4 and removed in 3.9. ~~AFAIK the macdeployplus scripts is only used when calling `make deploy` locally (on macOS). The linux cross compile build (like gitian) are not affected by this PR.~~ ACKs for top commit: fanquake: ACK 04a69c2 - I checked that `make deploy` on macOS currently fails when building master and using Python 3.9. This PR fixes that, and it's fine to use (and backport) these changes as they only require Python 3.4. Related note: I think we could just about drop our native_biplist dependency entirely given some changes upstream. practicalswift: ACK 04a69c2: patch looks correct Tree-SHA512: c5bb60c5157b371d680c82e0978470a488f3edc58cd09e1be635fed59420f227dd113e901c28e15a463da6fe81dc64d08a701b1fdfeb4502f418785707dbebbc
2 parents c51c275 + 04a69c2 commit a0c00ff

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

contrib/macdeploy/macdeployqtplus

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -586,7 +586,8 @@ if len(config.fancy) == 1:
586586
sys.exit(1)
587587

588588
try:
589-
fancy = plistlib.readPlist(p)
589+
with open(p, 'rb') as fp:
590+
fancy = plistlib.load(fp, fmt=plistlib.FMT_XML)
590591
except:
591592
if verbose >= 1:
592593
sys.stderr.write("Error: Could not parse fancy disk image plist at \"{}\"\n".format(p))

0 commit comments

Comments
 (0)