Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.py @ 43421:be384a2052aa stable
py3: don't use bytes with vars() or __dict__
Inspired by D7227. These were all the remaining instances I could
find.
Differential Revision: https://phab.mercurial-scm.org/D7230
| author | Martin von Zweigbergk <martinvonz@google.com> |
|---|---|
| date | Tue, 05 Nov 2019 08:42:42 -0800 |
| parents | 8ff1ecfadcd1 |
| children | 0b7733719d21 |
line wrap: on
line diff
--- a/mercurial/merge.py Tue Nov 05 12:10:38 2019 -0500 +++ b/mercurial/merge.py Tue Nov 05 08:42:42 2019 -0800 @@ -171,7 +171,7 @@ self._local = None self._other = None self._labels = labels - for var in (b'localctx', b'otherctx'): + for var in ('localctx', 'otherctx'): if var in vars(self): delattr(self, var) if node: @@ -196,7 +196,7 @@ self._stateextras = {} self._local = None self._other = None - for var in (b'localctx', b'otherctx'): + for var in ('localctx', 'otherctx'): if var in vars(self): delattr(self, var) self._readmergedriver = None