From 00dc5a93c12484c3df57bd3bf2e0c6e78345a98b Mon Sep 17 00:00:00 2001 From: Fred Drake Date: Tue, 31 Dec 2002 06:55:41 +0000 Subject: [PATCH] ConfigParser._interpolate(): Pass the missing key to the InterpolationError constructor, not the KeyError exception itself. (Caught by the new InterpolationError test.) SafeConfigParser._interpolate_some(): Pass the right number of arguments to the InterpolationError constructor. (Caught by pychecker.) --- Lib/ConfigParser.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Lib/ConfigParser.py b/Lib/ConfigParser.py index 24a4f23eb3d..7c2eba5cffc 100644 --- a/Lib/ConfigParser.py +++ b/Lib/ConfigParser.py @@ -554,8 +554,8 @@ def _interpolate(self, section, option, rawval, vars): if value.find("%(") != -1: try: value = value % vars - except KeyError, key: - raise InterpolationError(key, option, section, rawval) + except KeyError, e: + raise InterpolationError(e[0], option, section, rawval) else: break if value.find("%(") != -1: @@ -599,8 +599,7 @@ def _interpolate_some(self, option, accum, rest, section, map, depth): try: v = map[var] except KeyError: - raise InterpolationError( - "no value found for %r" % var) + raise InterpolationError(var, option, section, rest) if "%" in v: self._interpolate_some(option, accum, v, section, map, depth + 1)