Mercurial > public > mercurial-scm > hg
comparison mercurial/filemerge.py @ 43089:c59eb1560c44
py3: manually import getattr where it is needed
The march continues.
Differential Revision: https://phab.mercurial-scm.org/D7009
| author | Gregory Szorc <gregory.szorc@gmail.com> |
|---|---|
| date | Sun, 06 Oct 2019 16:55:18 -0400 |
| parents | eef9a2d67051 |
| children | d783f945a701 |
comparison
equal
deleted
inserted
replaced
| 43088:0d612db7047c | 43089:c59eb1560c44 |
|---|---|
| 16 from .node import ( | 16 from .node import ( |
| 17 hex, | 17 hex, |
| 18 nullid, | 18 nullid, |
| 19 short, | 19 short, |
| 20 ) | 20 ) |
| 21 from .pycompat import open | 21 from .pycompat import ( |
| 22 getattr, | |
| 23 open, | |
| 24 ) | |
| 22 | 25 |
| 23 from . import ( | 26 from . import ( |
| 24 encoding, | 27 encoding, |
| 25 error, | 28 error, |
| 26 formatter, | 29 formatter, |