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

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>
lime2-spi
Paul Burton 7 years ago committed by Simon Glass
parent b8c455500a
commit 052ca37daa
  1. 8
      test/py/conftest.py

@ -18,11 +18,15 @@ import os
import os.path import os.path
import pytest import pytest
from _pytest.runner import runtestprotocol from _pytest.runner import runtestprotocol
import ConfigParser
import re import re
import StringIO import StringIO
import sys import sys
try:
import configparser
except:
import ConfigParser as configparser
# Globals: The HTML log file, and the connection to the U-Boot console. # Globals: The HTML log file, and the connection to the U-Boot console.
log = None log = None
console = None console = None
@ -166,7 +170,7 @@ def pytest_configure(config):
with open(dot_config, 'rt') as f: with open(dot_config, 'rt') as f:
ini_str = '[root]\n' + f.read() ini_str = '[root]\n' + f.read()
ini_sio = StringIO.StringIO(ini_str) ini_sio = StringIO.StringIO(ini_str)
parser = ConfigParser.RawConfigParser() parser = configparser.RawConfigParser()
parser.readfp(ini_sio) parser.readfp(ini_sio)
ubconfig.buildconfig.update(parser.items('root')) ubconfig.buildconfig.update(parser.items('root'))

Loading…
Cancel
Save