Mercurial > public > mercurial-scm > hg
diff hgext/convert/common.py @ 51683:1eab9e40c0c8
convert: fix various leaked file descriptors
Some of these only leaked if an exception occurred between the open and close,
but a lot of these leaked unconditionally.
A type hint is added to `parsesplicemap` because otherwise this change caused
pytype to change the return type from this to `Dict[nothing, nothing]`.
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Thu, 11 Jul 2024 21:54:02 -0400 |
| parents | 39033e7a6e0a |
| children | f4733654f144 |
line wrap: on
line diff
--- a/hgext/convert/common.py Thu Jul 11 21:16:45 2024 -0400 +++ b/hgext/convert/common.py Thu Jul 11 21:54:02 2024 -0400 @@ -575,22 +575,25 @@ fp = open(self.path, b'rb') except FileNotFoundError: return - for i, line in enumerate(fp): - line = line.splitlines()[0].rstrip() - if not line: - # Ignore blank lines - continue - try: - key, value = line.rsplit(b' ', 1) - except ValueError: - raise error.Abort( - _(b'syntax error in %s(%d): key/value pair expected') - % (self.path, i + 1) - ) - if key not in self: - self.order.append(key) - super(mapfile, self).__setitem__(key, value) - fp.close() + + try: + for i, line in enumerate(fp): + line = line.splitlines()[0].rstrip() + if not line: + # Ignore blank lines + continue + try: + key, value = line.rsplit(b' ', 1) + except ValueError: + raise error.Abort( + _(b'syntax error in %s(%d): key/value pair expected') + % (self.path, i + 1) + ) + if key not in self: + self.order.append(key) + super(mapfile, self).__setitem__(key, value) + finally: + fp.close() def __setitem__(self, key, value) -> None: if self.fp is None: