[Python-checkins] cpython (merge 3.5 -> 3.6): Merge 3.5, fix for #24142
lukasz.langa
python-checkins at python.org
Sat Nov 26 17:05:44 EST 2016
https://hg.python.org/cpython/rev/306cfb866399
changeset: 105375:306cfb866399
branch: 3.6
parent: 105372:3434d84efdd4
parent: 105374:40567b8e3478
user: Łukasz Langa <lukasz at langa.pl>
date: Sat Nov 26 14:02:48 2016 -0800
summary:
Merge 3.5, fix for #24142
files:
Lib/configparser.py | 2 +-
Lib/test/test_configparser.py | 24 +++++++++++++++++++++++
Misc/ACKS | 1 +
Misc/NEWS | 3 ++
4 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/Lib/configparser.py b/Lib/configparser.py
--- a/Lib/configparser.py
+++ b/Lib/configparser.py
@@ -1102,10 +1102,10 @@
# raised at the end of the file and will contain a
# list of all bogus lines
e = self._handle_error(e, fpname, lineno, line)
+ self._join_multiline_values()
# if any parsing errors occurred, raise an exception
if e:
raise e
- self._join_multiline_values()
def _join_multiline_values(self):
defaults = self.default_section, self._defaults
diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py
--- a/Lib/test/test_configparser.py
+++ b/Lib/test/test_configparser.py
@@ -9,6 +9,7 @@
from test import support
+
class SortedDict(collections.UserDict):
def items(self):
@@ -64,6 +65,7 @@
cf.read_string(string)
return cf
+
class BasicTestCase(CfgParserTestCaseClass):
def basic_test(self, cf):
@@ -828,6 +830,21 @@
self.assertEqual(set(cf['section3'].keys()), set())
self.assertEqual(cf.sections(), ['section1', 'section2', 'section3'])
+ def test_invalid_multiline_value(self):
+ if self.allow_no_value:
+ self.skipTest('if no_value is allowed, ParsingError is not raised')
+
+ invalid = textwrap.dedent("""\
+ [DEFAULT]
+ test {0} test
+ invalid""".format(self.delimiters[0])
+ )
+ cf = self.newconfig()
+ with self.assertRaises(configparser.ParsingError):
+ cf.read_string(invalid)
+ self.assertEqual(cf.get('DEFAULT', 'test'), 'test')
+ self.assertEqual(cf['DEFAULT']['test'], 'test')
+
class StrictTestCase(BasicTestCase, unittest.TestCase):
config_class = configparser.RawConfigParser
@@ -981,14 +998,17 @@
cf.set("sect", "option2", "foo%%bar")
self.assertEqual(cf.get("sect", "option2"), "foo%%bar")
+
class ConfigParserTestCaseNonStandardDelimiters(ConfigParserTestCase):
delimiters = (':=', '$')
comment_prefixes = ('//', '"')
inline_comment_prefixes = ('//', '"')
+
class ConfigParserTestCaseNonStandardDefaultSection(ConfigParserTestCase):
default_section = 'general'
+
class MultilineValuesTestCase(BasicTestCase, unittest.TestCase):
config_class = configparser.ConfigParser
wonderful_spam = ("I'm having spam spam spam spam "
@@ -1017,6 +1037,7 @@
self.assertEqual(cf_from_file.get('section8', 'lovely_spam4'),
self.wonderful_spam.replace('\t\n', '\n'))
+
class RawConfigParserTestCase(BasicTestCase, unittest.TestCase):
config_class = configparser.RawConfigParser
@@ -1059,11 +1080,13 @@
cf.set('non-string', 1, 1)
self.assertEqual(cf.get('non-string', 1), 1)
+
class RawConfigParserTestCaseNonStandardDelimiters(RawConfigParserTestCase):
delimiters = (':=', '$')
comment_prefixes = ('//', '"')
inline_comment_prefixes = ('//', '"')
+
class RawConfigParserTestSambaConf(CfgParserTestCaseClass, unittest.TestCase):
config_class = configparser.RawConfigParser
comment_prefixes = ('#', ';', '----')
@@ -1258,6 +1281,7 @@
class ConfigParserTestCaseNoValue(ConfigParserTestCase):
allow_no_value = True
+
class ConfigParserTestCaseTrickyFile(CfgParserTestCaseClass, unittest.TestCase):
config_class = configparser.ConfigParser
delimiters = {'='}
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -663,6 +663,7 @@
Ludwig Hähne
Gerhard Häring
Fredrik Håård
+Florian Höch
Catalin Iacob
Mihai Ibanescu
Ali Ikinci
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -17,6 +17,9 @@
Library
-------
+- Issue #24142: Reading a corrupt config file left configparser in an
+ invalid state. Original patch by Florian Höch.
+
Tools/Demos
-----------
--
Repository URL: https://hg.python.org/cpython
More information about the Python-checkins
mailing list