[clang] 1a3b801 - [analyzer] SATestBuild.py: Fix handling invalid plists after 2to3 conversion.

[Artem Dergachev via cfe-commits]

Author: Artem Dergachev
Date: 2020-05-15T14:27:30+03:00
New Revision: 1a3b801db5afe98718b31ba9a760e06557daccb1

URL: https://github.com/llvm/llvm-project/commit/1a3b801db5afe98718b31ba9a760e06557daccb1
DIFF: https://github.com/llvm/llvm-project/commit/1a3b801db5afe98718b31ba9a760e06557daccb1.diff

LOG: [analyzer] SATestBuild.py: Fix handling invalid plists after 2to3 conversion.

The updated plistlib throws a different exception class.

Added: 
    

Modified: 
    clang/utils/analyzer/SATestBuild.py

Removed: 
    


################################################################################
diff  --git a/clang/utils/analyzer/SATestBuild.py b/clang/utils/analyzer/SATestBuild.py
index 7ca054400716..02eb887500d7 100755
--- a/clang/utils/analyzer/SATestBuild.py
+++ b/clang/utils/analyzer/SATestBuild.py
@@ -58,7 +58,7 @@
 import sys
 import threading
 import time
-from xml.parsers.expat import ExpatError
+
 try:
     import queue
 except ImportError:
@@ -493,7 +493,7 @@ def CleanUpEmptyPlists(SBOutputDir):
             if not Data['files']:
                 os.remove(P)
                 continue
-        except ExpatError as e:
+        except plistlib.InvalidFileException as e:
             print('Error parsing plist file %s: %s' % (P, str(e)))
             continue