GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-17 12:41:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

test/py: Import 'configparser' lower case to be python 3.x safe

Browse source 
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.burton@imgtec.com>
Reviewed-by: Stephen Warren <swarren@nvidia.com>
This commit is contained in:
Paul Burton 2017-09-14 14:34:45 -07:00 • committed by Simon Glass
parent b8c455500a
commit 052ca37daa
1 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
test/py/conftest.py
View file

@ -18,11 +18,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
@ -166,7 +170,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'))