In python 3.x the configparser module is named with all lower case.
Import it as such in order to avoid errors when running on python 3.x,
and fall back to the CamelCase version in order to keep working with
python 2.x.
Signed-off-by: Paul Burton <paul.bur...@imgtec.com>
Reviewed-by: Stephen Warren <swar...@nvidia.com>
---
Changes in v2:
- Import python 2.x ConfigParser as the python 3.x style configparser, rather
than the other way around.
test/py/conftest.py | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/test/py/conftest.py b/test/py/conftest.py
index ced96f1006..bf55bd3d13 100644
--- a/test/py/conftest.py
+++ b/test/py/conftest.py
@@ -19,11 +19,15 @@ import os
import os.path
import pytest
from _pytest.runner import runtestprotocol
-import ConfigParser
import re
import StringIO
import sys
+try:
+ import configparser
+except:
+ import ConfigParser as configparser
+
# Globals: The HTML log file, and the connection to the U-Boot console.
log = None
console = None
@@ -167,7 +171,7 @@ def pytest_configure(config):
with open(dot_config, 'rt') as f:
ini_str = '[root]\n' + f.read()
ini_sio = StringIO.StringIO(ini_str)
- parser = ConfigParser.RawConfigParser()
+ parser = configparser.RawConfigParser()
parser.readfp(ini_sio)
ubconfig.buildconfig.update(parser.items('root'))
--
2.14.1
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
https://lists.denx.de/listinfo/u-boot
