This is an archive of the discontinued Mercurial Phabricator instance.

Differential D5649

config: reject str sections and keys on Python 3
ClosedPublic

Authored by indygreg on Jan 22 2019, 9:44 PM.

Details

Reviewers
None
Group Reviewers
hg-reviewers
Commits
rHG4ad002b2584d: config: reject str sections and keys on Python 3
Summary

Otherwise we could end up with a dict having both the str
and bytes versions of a particular config item. This may cause
some tests to regress. I haven't checked. But it is better
behavior to fail fast.

We could just as easily change this to normalize the values. But
I like catching all non-compliant call sites first.

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

indygreg created this revision.Jan 22 2019, 9:44 PM
Closed by commit rHG4ad002b2584d: config: reject str sections and keys on Python 3 (authored by indygreg). · Explain WhyJan 23 2019, 12:49 AM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mmercurial/config.py (4 lines)

Diff 13361

mercurial/config.py

def source(self, section, item): def source(self, section, item):
return self._source.get((section, item), "") return self._source.get((section, item), "")
def sections(self): def sections(self):
return sorted(self._data.keys()) return sorted(self._data.keys())
def items(self, section): def items(self, section):
return list(self._data.get(section, {}).iteritems()) return list(self._data.get(section, {}).iteritems())
def set(self, section, item, value, source=""): def set(self, section, item, value, source=""):
if pycompat.ispy3: if pycompat.ispy3:
assert not isinstance(section, str), (
'config section may not be unicode strings on Python 3')
assert not isinstance(item, str), (
'config item may not be unicode strings on Python 3')
assert not isinstance(value, str), ( assert not isinstance(value, str), (
'config values may not be unicode strings on Python 3') 'config values may not be unicode strings on Python 3')
if section not in self: if section not in self:
self._data[section] = util.cowsortdict() self._data[section] = util.cowsortdict()
else: else:
self._data[section] = self._data[section].preparewrite() self._data[section] = self._data[section].preparewrite()
self._data[section][item] = value self._data[section][item] = value
if source: if source: