mirror of
https://github.com/kovidgoyal/calibre.git
synced 2026-04-04 16:21:57 -04:00
f99a9421d4
This check broke with Python 3.5, because REQUEST_TIMEOUT changed from being simply an integer constant to being an instance of the new HTTPStatus enum: https://docs.python.org/3/library/http.html#http.HTTPStatus on Python 3.5+, `str(http.client.REQUEST_TIMEOUT)` gives `"HTTPStatus.REQUEST_TIMEOUT"`, not `"408"`. Simply comparing as `int` not `unicode_type` should work with all Pythons (2, 3 before 3.5, and 3.5+). `int(REQUEST_TIMEOUT)` gives you `408` in all cases. This may not have been noticed till now because this check seems to be a kind of safety valve: it seems that usually, the `res = conn.getresponse()` call should raise `socket.timeout` itself, and this is some sort of backstop in case it doesn't. I caught this in Fedora Rawhide package builds: it seems that on most arches, we don't hit the bug because `conn.getresponse()` raises `socket.timeout` directly, but on 32-bit ARM for some reason we almost always hit this backstop, and that was causing the test to fail because of this problem. Signed-off-by: Adam Williamson <awilliam@redhat.com>