summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--clang/tools/scan-view/share/ScanView.py7
-rwxr-xr-xclang/utils/check_cfc/check_cfc.py7
2 files changed, 10 insertions, 4 deletions
diff --git a/clang/tools/scan-view/share/ScanView.py b/clang/tools/scan-view/share/ScanView.py
index b489589d001..b465c971dbf 100644
--- a/clang/tools/scan-view/share/ScanView.py
+++ b/clang/tools/scan-view/share/ScanView.py
@@ -16,7 +16,10 @@ import socket
import itertools
import Reporter
-import ConfigParser
+try:
+ import configparser
+except ImportError:
+ import ConfigParser as configparser
###
# Various patterns matched or replaced by server.
@@ -126,7 +129,7 @@ class ScanViewServer(HTTPServer):
self.load_config()
def load_config(self):
- self.config = ConfigParser.RawConfigParser()
+ self.config = configparser.RawConfigParser()
# Add defaults
self.config.add_section('ScanView')
diff --git a/clang/utils/check_cfc/check_cfc.py b/clang/utils/check_cfc/check_cfc.py
index 7a739f46e30..0228f1d6259 100755
--- a/clang/utils/check_cfc/check_cfc.py
+++ b/clang/utils/check_cfc/check_cfc.py
@@ -56,7 +56,10 @@ import shutil
import subprocess
import sys
import tempfile
-import ConfigParser
+try:
+ import configparser
+except ImportError:
+ import ConfigParser as configparser
import io
import obj_diff
@@ -318,7 +321,7 @@ if __name__ == '__main__':
for c in checks:
default_config += "{} = false\n".format(c)
- config = ConfigParser.RawConfigParser()
+ config = configparser.RawConfigParser()
config.readfp(io.BytesIO(default_config))
scriptdir = get_main_dir()
config_path = os.path.join(scriptdir, 'check_cfc.cfg')
OpenPOWER on IntegriCloud