Issue 16584: in filecomp._cmp, catch IOError as well as os.error.

Patch by Till Maas.
2013-05-08 23:42:41 -04:00 · 2013-05-08 23:42:41 -04:00 · 673770c59d
parent db03e6b842
commit 673770c59d
3 changed files with 5 additions and 1 deletions
--- a/Lib/filecmp.py
+++ b/Lib/filecmp.py
@ -268,7 +268,7 @@ def cmpfiles(a, b, common, shallow=1):
 def _cmp(a, b, sh, abs=abs, cmp=cmp):
    try:
        return not abs(cmp(a, b, sh))
-    except os.error:
+    except (os.error, IOError):
        return 2


--- a/Misc/ACKS
+++ b/Misc/ACKS
@ -626,6 +626,7 @@ Mark Lutz
 Jim Lynch
 Mikael Lyngvig
 Martin von Löwis
+Till Maas
 Jeff MacDonald
 John Machin
 Andrew I MacIntyre
--- a/Misc/NEWS
+++ b/Misc/NEWS
@ -26,6 +26,9 @@ Core and Builtins
 Library
 -------

+- Issue 16584: in filecomp._cmp, catch IOError as well as os.error.
+  Patch by Till Maas.
+
 - Issue #17926: Fix dbm.__contains__ on 64-bit big-endian machines.

 - Issue #17918: When using SSLSocket.accept(), if the SSL handshake failed