From 332937db96017c99a512894b8ebf38396c9aa703 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Mon, 27 Jul 2015 07:25:35 -0400 Subject: Clean ups in config.py --- coverage/config.py | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) (limited to 'coverage/config.py') diff --git a/coverage/config.py b/coverage/config.py index c64be6c..4b50712 100644 --- a/coverage/config.py +++ b/coverage/config.py @@ -4,17 +4,10 @@ """Config file for coverage.py""" import os, re, sys -from coverage.backward import string_class, iitems +from coverage.backward import configparser, iitems, string_class from coverage.misc import CoverageException -# In py3, ConfigParser was renamed to the more-standard configparser -try: - import configparser -except ImportError: - import ConfigParser as configparser - - class HandyConfigParser(configparser.RawConfigParser): """Our specialization of ConfigParser.""" @@ -114,10 +107,8 @@ class HandyConfigParser(configparser.RawConfigParser): re.compile(value) except re.error as e: raise CoverageException( - "Invalid [%s].%s value %r: %s" % ( - section, option, value, e - ) - ) + "Invalid [%s].%s value %r: %s" % (section, option, value, e) + ) if value: value_list.append(value) return value_list @@ -218,9 +209,7 @@ class CoverageConfig(object): try: files_read = cp.read(filename) except configparser.Error as err: - raise CoverageException( - "Couldn't read config file %s: %s" % (filename, err) - ) + raise CoverageException("Couldn't read config file %s: %s" % (filename, err)) if not files_read: return False @@ -230,9 +219,7 @@ class CoverageConfig(object): for option_spec in self.CONFIG_FILE_OPTIONS: self._set_attr_from_config_option(cp, *option_spec) except ValueError as err: - raise CoverageException( - "Couldn't read config file %s: %s" % (filename, err) - ) + raise CoverageException("Couldn't read config file %s: %s" % (filename, err)) # [paths] is special if cp.has_section('paths'): -- cgit v1.2.1