diff tests/test-merge2.t @ 48886:b5fe10b3c9f5 stable

py3: don?t subscript socket.error On Python 2, socket.error was subscriptable. On Python 3, socket.error is an alias to OSError and is not subscriptable. The except block passes the exception to self.send_error(). This fails on both Python 2 (if it was executed) and Python 3, as it expects a string. Getting the attribute .strerror works on Python 2 and Python 3, and has the same effect as the previous code on Python 2.
author Manuel Jacob <me@manueljacob.de>
date Thu, 02 Jun 2022 04:39:49 +0200
parents 8d72e29ad1e0
children
line wrap: on
line diff