Skip to content

C
cpython
Kaydet (Commit) 673770c5 authored tarafından Terry Jan Reedy's avatar Terry Jan Reedy
Dosyalara gözat
Seçenekler

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

Patch by Till Maas.
üst db03e6b8
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 1 deletion
Lib/filecmp.py
Dosyayı görüntüle @ 673770c5
...@@ -268,7 +268,7 @@ def cmpfiles(a, b, common, shallow=1): ...@@ -268,7 +268,7 @@ def cmpfiles(a, b, common, shallow=1):
def _cmp(a, b, sh, abs=abs, cmp=cmp): def _cmp(a, b, sh, abs=abs, cmp=cmp):
try: try:
return not abs(cmp(a, b, sh)) return not abs(cmp(a, b, sh))
except os.error: except (os.error, IOError):
return 2 return 2
......
Misc/ACKS
Dosyayı görüntüle @ 673770c5
...@@ -626,6 +626,7 @@ Mark Lutz ...@@ -626,6 +626,7 @@ Mark Lutz
Jim Lynch Jim Lynch
Mikael Lyngvig Mikael Lyngvig
Martin von Löwis Martin von Löwis
Till Maas
Jeff MacDonald Jeff MacDonald
John Machin John Machin
Andrew I MacIntyre Andrew I MacIntyre
......
Misc/NEWS
Dosyayı görüntüle @ 673770c5
...@@ -26,6 +26,9 @@ Core and Builtins ...@@ -26,6 +26,9 @@ Core and Builtins
Library 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 #17926: Fix dbm.__contains__ on 64-bit big-endian machines.
- Issue #17918: When using SSLSocket.accept(), if the SSL handshake failed - Issue #17918: When using SSLSocket.accept(), if the SSL handshake failed
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment