starlingx/config
Code Issues Proposed changes

Fix StringIO and ConfigParser import issue for Python2/3 compatible code.

Browse Source 
Use io.StringIO to replace StringIO.StringIO, and use unicode as StringIO()
  can only handle unicode strings.

Story: 2003429
Task: 24618

Depends-On: Ic5411ac4e9c7be9de329fa99dd438aeba1914fbd
Change-Id: Ie2ced7bba00d11b1698422cbe495abc0fbab7637
Signed-off-by: chenyan <yan.chen@intel.com>
Signed-off-by: Sun Austin <austin.sun@intel.com>
This commit is contained in:
chenyan 2018-08-30 17:28:00 +08:00 committed by Scott Little
parent e388fce523
commit d12717e718
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
tsconfig/tsconfig/tsconfig/tsconfig.py
View File

@ -6,8 +6,8 @@ SPDX-License-Identifier: Apache-2.0
"""
import os
import ConfigParser
import StringIO
from six.moves import configparser
import io
import logging
SW_VERSION = ""
@ -54,17 +54,17 @@ def _load():
# The build.info file has no section headers, which causes problems
# for ConfigParser. So we'll fake it out.
ini_str = '[build_info]\n' + open(build_info, 'r').read()
ini_fp = StringIO.StringIO(ini_str)
ini_str = u'[build_info]\n' + open(build_info, 'r').read()
ini_fp = io.StringIO(ini_str)
config = ConfigParser.SafeConfigParser()
config = configparser.SafeConfigParser()
config.readfp(ini_fp)
try:
value = config.get('build_info', 'SW_VERSION')
SW_VERSION = value.strip('"')
except ConfigParser.Error:
except configparser.Error:
logging.exception("Failed to read SW_VERSION from /etc/build.info")
return False
@ -72,8 +72,8 @@ def _load():
# The platform.conf file has no section headers, which causes problems
# for ConfigParser. So we'll fake it out.
ini_str = '[platform_conf]\n' + open(PLATFORM_CONF_FILE, 'r').read()
ini_fp = StringIO.StringIO(ini_str)
ini_str = u'[platform_conf]\n' + open(PLATFORM_CONF_FILE, 'r').read()
ini_fp = io.StringIO(ini_str)
config.readfp(ini_fp)
try:
@ -147,7 +147,7 @@ def _load():
if config.has_option('platform_conf', 'security_feature'):
security_feature = config.get('platform_conf', 'security_feature')
except ConfigParser.Error:
except configparser.Error:
logging.exception("Failed to read platform.conf")
return False