← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/util/configobj/configobj.py

  • Committer: Vincent Ladeuil
  • Date: 2017-01-17 13:48:10 UTC
  • mfrom: (6615.3.6 merges)
  • mto: This revision was merged to the branch mainline in revision 6620.
  • Revision ID: v.ladeuil+lp@free.fr-20170117134810-j9p3lidfy6pfyfsc
Merge 2.7, resolving conflicts

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/util/configobj/configobj.py
17
17
# Comments, suggestions and bug reports welcome.
18
18
 
19
19
 
20
 
from __future__ import generators
 
20
from __future__ import absolute_import
21
21
 
22
22
import sys
23
23
import os
1794
1794
    def _get_triple_quote(self, value):
1795
1795
        if (value.find('"""') != -1) and (value.find("'''") != -1):
1796
1796
            raise ConfigObjError('Value "%s" cannot be safely quoted.' % value)
 
1797
        # upstream version (up to version 4.7.2) has the bug with incorrect quoting;
 
1798
        # fixed in our copy based on the suggestion of ConfigObj's author
1797
1799
        if value.find('"""') == -1:
 
1800
            quot = tsquot
 
1801
        else:
1798
1802
            quot = tdquot
1799
 
        else:
1800
 
            quot = tsquot
1801
1803
        return quot
1802
1804
 
1803
1805