changeset 43105 | 649d3ac37a12 |
parent 43089 | c59eb1560c44 |
child 44021 | 6d3b67a837a6 |
--- a/hgext/convert/cvs.py Sun Oct 06 17:59:15 2019 -0400 +++ b/hgext/convert/cvs.py Sun Oct 06 19:25:18 2019 -0400 @@ -19,6 +19,7 @@ from mercurial import ( encoding, error, + pycompat, util, ) from mercurial.utils import ( @@ -319,7 +320,7 @@ if full: raise error.Abort(_(b"convert from cvs does not support --full")) self._parse() - return sorted(self.files[rev].iteritems()), {}, set() + return sorted(pycompat.iteritems(self.files[rev])), {}, set() def getcommit(self, rev): self._parse()