Mercurial > public > mercurial-scm > hg-stable
diff mercurial/sshpeer.py @ 52665: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 | b52f2b365eff |
| children | 5ec596c91086 |
line wrap: on
line diff
--- a/mercurial/sshpeer.py Mon Jan 06 14:15:40 2025 -0500 +++ b/mercurial/sshpeer.py Sun Jan 05 21:03:17 2025 -0500 @@ -169,7 +169,7 @@ try: for l in pipee: ui.status(_(b'remote: '), l) - except (IOError, ValueError): + except (OSError, ValueError): pass pipee.close() @@ -316,7 +316,7 @@ stdin.write(b''.join(handshake)) stdin.flush() - except IOError: + except OSError: badresponse() # Assume version 1 of wire protocol by default. @@ -350,7 +350,7 @@ ui.debug(b'remote: ', l) lines.append(l) max_noise -= 1 - except IOError: + except OSError: badresponse() else: badresponse() @@ -709,7 +709,7 @@ peer._call( b"protocaps", caps=b' '.join(sorted(_clientcapabilities())) ) - except IOError: + except OSError: peer._cleanup() raise error.RepoError(_(b'capability exchange failed'))