Mercurial > public > mercurial-scm > hg
diff hgext/mq.py @ 49306:2e726c934fcd
py3: catch FileNotFoundError instead of checking errno == ENOENT
author | Manuel Jacob <me@manueljacob.de> |
---|---|
date | Tue, 31 May 2022 22:50:01 +0200 |
parents | 53e9422a9b45 |
children | f22364e4eb13 |
line wrap: on
line diff
--- a/hgext/mq.py Tue May 31 21:16:17 2022 +0200 +++ b/hgext/mq.py Tue May 31 22:50:01 2022 +0200 @@ -63,7 +63,6 @@ ''' -import errno import os import re import shutil @@ -551,19 +550,15 @@ try: lines = self.opener.read(self.statuspath).splitlines() return list(parselines(lines)) - except IOError as e: - if e.errno == errno.ENOENT: - return [] - raise + except FileNotFoundError: + return [] @util.propertycache def fullseries(self): try: return self.opener.read(self.seriespath).splitlines() - except IOError as e: - if e.errno == errno.ENOENT: - return [] - raise + except FileNotFoundError: + return [] @util.propertycache def series(self): @@ -691,9 +686,7 @@ self.activeguards = [] try: guards = self.opener.read(self.guardspath).split() - except IOError as err: - if err.errno != errno.ENOENT: - raise + except FileNotFoundError: guards = [] for i, guard in enumerate(guards): bad = self.checkguard(guard) @@ -1140,9 +1133,8 @@ for p in patches: try: os.unlink(self.join(p)) - except OSError as inst: - if inst.errno != errno.ENOENT: - raise + except FileNotFoundError: + pass qfinished = [] if numrevs: