Mercurial > public > mercurial-scm > hg
diff hgext/lfs/blobstore.py @ 52640:24ee91ba9aa8
pyupgrade: drop usage of py3 aliases for `OSError`
These were different classes in py2, but now a handful of error classes are just
an alias of `OSError`, like `IOError`, `EnvironmentError`, `WindowsError`, etc.
This is the result of running a hacked version of `pyupgrade` 3.19.1[1]
$ hg files -0 'relglob:**.py' | xargs -0 \
pyupgrade --py38-plus --keep-percent-format --keep-mock --keep-runtime-typing
The hack is because it doesn't have command line switches to disable most
changes, so it makes tons of unrelated changes all at once. The hack is to
1) patch `pyupgrade._main._fix_tokens()` to immediately return its content arg
2) change `pyupgrade._data.register_decorator()` to only register the function
if it's from the fixer we're interested in:
if func.__module__ in (
"pyupgrade._plugins.exceptions",
):
FUNCS[tp].append(func)
return func
[1] https://github.com/asottile/pyupgrade
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Sun, 05 Jan 2025 21:03:17 -0500 |
| parents | d62887764687 |
| children | 5cc8deb96b48 |
line wrap: on
line diff
--- a/hgext/lfs/blobstore.py Mon Jan 06 14:15:40 2025 -0500 +++ b/hgext/lfs/blobstore.py Sun Jan 05 21:03:17 2025 -0500 @@ -13,7 +13,6 @@ import json import os import re -import socket from typing import ( Optional, @@ -89,7 +88,7 @@ # self.vfs. Raise the same error as a normal vfs when asked to read a # file that doesn't exist. The only difference is the full file path # isn't available in the error. - raise IOError( + raise OSError( errno.ENOENT, pycompat.sysstr(b'%s: No such file or directory' % oid), ) @@ -595,7 +594,7 @@ self._basictransfer(obj, action, localstore) yield 1, obj.get(b'oid') break - except socket.error as ex: + except OSError as ex: if retry > 0: self.ui.note( _(b'lfs: failed: %r (remaining retry %d)\n')