Python 2/3 compat - config parser

[michaelplatings]

tools/scan-view/share/ScanView.py

25 ↗

(On Diff #176341)

except ImportError:

[serge-sans-paille]

Thanks @michaelplatings for the review o/

[michaelplatings]

LGTM

cfe/trunk/tools/scan-view/share/ScanView.py

 import re
 import shutil
 import threading
 import time
 import socket
 import itertools
 
 import Reporter
-import ConfigParser
+try:
+    import configparser
+except ImportError:
+    import ConfigParser as configparser
 
 ###
 # Various patterns matched or replaced by server.
 
 kReportFileRE = re.compile('(.*/)?report-(.*)\\.html')
 
 kBugKeyValueRE = re.compile('<!-- BUG([^ ]*) (.*) -->')
 
def __init__(self, address, handler, root, reporters, options):
         self.root = root
         self.reporters = reporters
         self.options = options        
         self.halted = False
         self.config = None
         self.load_config()
 
     def load_config(self):
-        self.config = ConfigParser.RawConfigParser()
+        self.config = configparser.RawConfigParser()
 
         # Add defaults
         self.config.add_section('ScanView')
         for r in self.reporters:
             self.config.add_section(r.getName())
             for p in r.getParameters():
               if p.saveConfigValue():
                 self.config.set(r.getName(), p.getName(), '')

cfe/trunk/utils/check_cfc/check_cfc.py

 
 import imp
 import os
 import platform
 import shutil
 import subprocess
 import sys
 import tempfile
-import ConfigParser
+try:
+    import configparser
+except ImportError:
+    import ConfigParser as configparser
 import io
 
 import obj_diff
 
 def is_windows():
     """Returns True if running on Windows."""
     return platform.system() == 'Windows'
 

 """
 
     # Find all subclasses of WrapperCheck
     checks = [cls.__name__ for cls in vars()['WrapperCheck'].__subclasses__()]
 
     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')
     try:
         config.read(os.path.join(config_path))
     except:
         print("Could not read config from {}, "
               "using defaults.".format(config_path))