summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFred Drake <fdrake@acm.org>2001-07-06 17:22:48 (GMT)
committerFred Drake <fdrake@acm.org>2001-07-06 17:22:48 (GMT)
commitbeb6713ea700d28ea88c703f24c1ba6ba43230f8 (patch)
tree93990445ea49c8445ec05777803de58b06479479
parent45c23e61d88c20aa6a63060654fce182927ef915 (diff)
downloadcpython-beb6713ea700d28ea88c703f24c1ba6ba43230f8.zip
cpython-beb6713ea700d28ea88c703f24c1ba6ba43230f8.tar.gz
cpython-beb6713ea700d28ea88c703f24c1ba6ba43230f8.tar.bz2
When reading a continuation line, make sure we still use the transformed
name when filling in the internal data structures, otherwise we incorrectly raise a KeyError. This fixes SF bug #432369.
-rw-r--r--Lib/ConfigParser.py3
-rw-r--r--Lib/test/test_cfgparser.py7
2 files changed, 9 insertions, 1 deletions
diff --git a/Lib/ConfigParser.py b/Lib/ConfigParser.py
index cabbbdc..5eae972 100644
--- a/Lib/ConfigParser.py
+++ b/Lib/ConfigParser.py
@@ -431,7 +431,8 @@ class ConfigParser:
if line[0] in ' \t' and cursect is not None and optname:
value = line.strip()
if value:
- cursect[optname] = cursect[optname] + '\n ' + value
+ k = self.optionxform(optname)
+ cursect[k] = "%s\n%s" % (cursect[k], value)
# a section header or option header?
else:
# is it a section header?
diff --git a/Lib/test/test_cfgparser.py b/Lib/test/test_cfgparser.py
index 62395a0..0d8f199 100644
--- a/Lib/test/test_cfgparser.py
+++ b/Lib/test/test_cfgparser.py
@@ -70,6 +70,13 @@ def case_sensitivity():
cf.remove_option("a", "B")
verify(cf.options("a") == [])
+ # SF bug #432369:
+ cf = ConfigParser.ConfigParser()
+ sio = StringIO.StringIO("[MySection]\nOption: first line\n\tsecond line\n")
+ cf.readfp(sio)
+ verify(cf.options("MySection") == ["option"])
+ verify(cf.get("MySection", "Option") == "first line\nsecond line")
+
def interpolation(src):
print "Testing value interpolation..."