diff options
author | Davide Italiano <davide@freebsd.org> | 2019-05-18 01:57:12 +0000 |
---|---|---|
committer | Davide Italiano <davide@freebsd.org> | 2019-05-18 01:57:12 +0000 |
commit | 8803124d234ef26c40fbd66711b6d98bfd1ebe75 (patch) | |
tree | 9204f6fdb631d9f3ed5b48cbfd227c0aca2cca7e | |
parent | 38cc896f0026221f6e5c7b10cb2d6e450d61f160 (diff) | |
download | bcm5719-llvm-8803124d234ef26c40fbd66711b6d98bfd1ebe75.tar.gz bcm5719-llvm-8803124d234ef26c40fbd66711b6d98bfd1ebe75.zip |
[crashlog] Use loads() instead of readPlistFromString() for python 3.
<rdar://problem/50903413>
llvm-svn: 361087
-rwxr-xr-x | lldb/examples/python/crashlog.py | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/lldb/examples/python/crashlog.py b/lldb/examples/python/crashlog.py index 033be8c4cf3..ab8f52fecee 100755 --- a/lldb/examples/python/crashlog.py +++ b/lldb/examples/python/crashlog.py @@ -43,6 +43,12 @@ import sys import time import uuid +def read_plist(s): + if sys.version_info.major == 3: + return plistlib.loads(s) + else: + return plistlib.readPlistFromString(s) + try: # Just try for LLDB in case PYTHONPATH is already correctly setup import lldb @@ -282,7 +288,7 @@ class CrashLog(symbolication.Symbolicator): s = subprocess.check_output(dsym_for_uuid_command, shell=True) if s: try: - plist_root = plistlib.readPlistFromString(s) + plist_root = read_plist(s) except: print(("Got exception: ", sys.exc_info()[1], " handling dsymForUUID output: \n", s)) raise |