InterruptedError is not defined in Python 2 #846
Conversation
redis/_compat.py
Outdated
| except InterruptedError as e: | ||
| # Python 2 does not define InterruptedError, instead | ||
| # try to catch an OSError with errno == EINTR == 4. | ||
| if hasattr(e, 'errno') and (e.errno == 4 or e.errno is None): |
There was a problem hiding this comment.
While the comment helps, this could be clearer testing: e.errno == errno.EINTR. I believe the errno module is in both Py2 and Py3.
Also, in what case does e.errno is None mean we should treat the error as an interrupt and try again?
There was a problem hiding this comment.
Might be able to remove the errno is None check. I don't know if the InterruptedError exception sets errno on Python 3 but it might, we can try it! And I thought about doing the import but I'm not sure if all platforms define errno.EINTR. I know Windows has a lot of flakiness in the errno module. I'll use a getattr to be safe.
redis/_compat.py
Outdated
| # try to catch an OSError with errno == EINTR == 4. | ||
| if hasattr(e, 'errno') and (e.errno == 4 or e.errno is None): | ||
| continue | ||
| raise e |
There was a problem hiding this comment.
If we just raise (without the e), we'll get the original traceback. I'm not 100% certain, but I believe on some Python versions raise e would raise the exception starting there rather than where the exception originally took place.
There was a problem hiding this comment.
Sure, I'll switch this out.
|
@andymccurdy Thanks for the quick review! I've implemented your review comments. |
Fixes #845. Defined
InterruptedErrorasOSErrorif not defined like in Python 2.