1
=== modified file 'bzrlib/tests/test_config.py'
2
--- bzrlib/tests/test_config.py	2011-01-10 22:20:12 +0000
3
+++ bzrlib/tests/test_config.py	2011-02-22 09:51:57 +0000
4
@@ -309,11 +309,37 @@
5
309
        """
309
        """
6
310
        co = config.ConfigObj()
310
        co = config.ConfigObj()
7
311
        co['test'] = 'foo#bar'
311
        co['test'] = 'foo#bar'
9
312
        lines = co.write()
312
        outfile = StringIO()
10
313
        co.write(outfile=outfile)
11
314
        lines = outfile.getvalue().splitlines()
12
313
        self.assertEqual(lines, ['test = "foo#bar"'])
315
        self.assertEqual(lines, ['test = "foo#bar"'])
13
314
        co2 = config.ConfigObj(lines)
316
        co2 = config.ConfigObj(lines)
14
315
        self.assertEqual(co2['test'], 'foo#bar')
317
        self.assertEqual(co2['test'], 'foo#bar')
15
316
318
16
319
    def test_triple_quotes(self):
17
320
        # Bug #710410: if the value string has triple quotes
18
321
        # then ConfigObj versions up to 4.7.2 will quote them wrong
19
322
        # and won't able to read them back
20
323
        triple_quotes_value = '''spam
21
324
""" that's my spam """
22
325
eggs'''
23
326
        co = config.ConfigObj()
24
327
        co['test'] = triple_quotes_value
25
328
        # While writing this test another bug in ConfigObj has been found:
26
329
        # method co.write() without arguments produces list of lines
27
330
        # one option per line, and multiline values are not split
28
331
        # across multiple lines,
29
332
        # and that breaks the parsing these lines back by ConfigObj.
30
333
        # This issue only affects test, but it's better to avoid
31
334
        # `co.write()` construct at all.
32
335
        # [bialix 20110222] bug report sent to ConfigObj's author
33
336
        outfile = StringIO()
34
337
        co.write(outfile=outfile)
35
338
        output = outfile.getvalue()
36
339
        # now we're trying to read it back
37
340
        co2 = config.ConfigObj(StringIO(output))
38
341
        self.assertEquals(triple_quotes_value, co2['test'])
39
342
40
317
343
41
318
erroneous_config = """[section] # line 1
344
erroneous_config = """[section] # line 1
42
319
good=good # line 2
345
good=good # line 2
43
320
346
44
=== modified file 'bzrlib/util/configobj/configobj.py'
45
--- bzrlib/util/configobj/configobj.py	2009-04-17 22:24:54 +0000
46
+++ bzrlib/util/configobj/configobj.py	2011-02-22 09:51:57 +0000
47
@@ -1794,10 +1794,12 @@
48
1794
    def _get_triple_quote(self, value):
1794
    def _get_triple_quote(self, value):
49
1795
        if (value.find('"""') != -1) and (value.find("'''") != -1):
1795
        if (value.find('"""') != -1) and (value.find("'''") != -1):
50
1796
            raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
1796
            raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
51
1797
        # upstream version (up to version 4.7.2) has the bug with incorrect quoting;
52
1798
        # fixed in our copy based on the suggestion of ConfigObj's author
53
1797
        if value.find('"""') == -1:
1799
        if value.find('"""') == -1:
54
1800
            quot = tsquot
55
1801
        else:
56
1798
            quot = tdquot
1802
            quot = tdquot
57
1799
        else:
58
1800
            quot = tsquot
59
1801
        return quot
1803
        return quot
60
1802
1804
61
1803
1805
62
1804
1806
63
=== modified file 'doc/en/release-notes/bzr-2.2.txt'
64
--- doc/en/release-notes/bzr-2.2.txt	2011-02-09 08:24:25 +0000
65
+++ doc/en/release-notes/bzr-2.2.txt	2011-02-22 09:51:57 +0000
66
@@ -36,6 +36,10 @@
67
36
Internals
36
Internals
68
37
*********
37
*********
69
38
38
70
39
* Fixed bug in the bundled copy of ConfigObj with quoting of triple quotes
71
40
  in the value string. Fix suggested by ConfigObj's author Michael Foord.
72
41
  (Alexander Belchenko, #710410)
73
42
74
39
Testing
43
Testing
75
40
*******
44
*******
76
41
45
Reviewer	Review Type	Date Requested	Status
Martin Pool		2011-02-20	Approve on 2011-02-21
Review via email: mp+50511@code.launchpad.net