From ac8cb18fc75313d994e438c1c39ea2dcac9c2c05 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Thu, 8 Oct 2020 21:27:12 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=B9=20Feed=20the=20hobgoblins=20(delin?= =?UTF-8?q?t).?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/backports/configparser/__init__.py | 16 +++++++++------- src/test_configparser.py | 3 +-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/backports/configparser/__init__.py b/src/backports/configparser/__init__.py index d1dd937..0d7cbe0 100644 --- a/src/backports/configparser/__init__.py +++ b/src/backports/configparser/__init__.py @@ -1,5 +1,3 @@ -# flake8: noqa - """Configuration file parser. A configuration file consists of sections, lead by a "[section]" header, @@ -918,11 +916,15 @@ def items(self, section=_UNSET, raw=False, vars=None): if vars: for key, value in vars.items(): d[self.optionxform(key)] = value - value_getter = lambda option: self._interpolation.before_get( - self, section, option, d[option], d - ) - if raw: - value_getter = lambda option: d[option] + + def value_getter_interp(option): + return self._interpolation.before_get(self, section, option, d[option], d) + + def value_getter_raw(option): + return d[option] + + value_getter = value_getter_raw if raw else value_getter_interp + return [(option, value_getter(option)) for option in orig_keys] def popitem(self): diff --git a/src/test_configparser.py b/src/test_configparser.py index 80ab36f..b32c45d 100644 --- a/src/test_configparser.py +++ b/src/test_configparser.py @@ -1,5 +1,3 @@ -# flake8: noqa - import io import os import textwrap @@ -747,6 +745,7 @@ def test_set_string_types(self): ) # Check that we don't get an exception when setting values in # an existing section using strings: + class mystr(str): pass