diff options
| author | AlexSm <alex@ydb.tech> | 2024-08-19 16:16:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-08-19 17:16:30 +0300 |
| commit | 9b567afd3339f4525feab53873592cb025b14251 (patch) | |
| tree | 5c8489f98dc5a9a10f66065055e5a401bbd14767 /contrib/tools/python3/Lib/filecmp.py | |
| parent | 47bd121575c210d4bbb2dddcc2131759a694df05 (diff) | |
| download | ydb-9b567afd3339f4525feab53873592cb025b14251.tar.gz | |
Library import 240819-0942 (#7994)
Co-authored-by: robot-piglet <robot-piglet@yandex-team.com>
Co-authored-by: hiddenpath <hiddenpath@yandex-team.com>
Co-authored-by: bulatman <bulatman@yandex-team.com>
Co-authored-by: robot-contrib <robot-contrib@yandex-team.com>
Co-authored-by: osidorkin <osidorkin@yandex-team.com>
Co-authored-by: akhropov <akhropov@yandex-team.com>
Co-authored-by: akozhikhov <akozhikhov@yandex-team.com>
Co-authored-by: orlovorlov <orlovorlov@yandex-team.com>
Co-authored-by: babenko <babenko@yandex-team.com>
Co-authored-by: shadchin <shadchin@yandex-team.com>
Co-authored-by: dmasloff <dmasloff@yandex-team.com>
Co-authored-by: aleksei-le <aleksei-le@yandex-team.com>
Co-authored-by: coteeq <coteeq@yandex-team.com>
Co-authored-by: dimdim11 <dimdim11@yandex-team.com>
Co-authored-by: robot-ya-builder <robot-ya-builder@yandex-team.com>
Co-authored-by: iaz1607 <iaz1607@yandex-team.com>
Diffstat (limited to 'contrib/tools/python3/Lib/filecmp.py')
| -rw-r--r-- | contrib/tools/python3/Lib/filecmp.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/contrib/tools/python3/Lib/filecmp.py b/contrib/tools/python3/Lib/filecmp.py index 30bd900fa80..6fdb48f7a39 100644 --- a/contrib/tools/python3/Lib/filecmp.py +++ b/contrib/tools/python3/Lib/filecmp.py @@ -160,12 +160,14 @@ class dircmp: ok = True try: a_stat = os.stat(a_path) - except OSError: + except (OSError, ValueError): + # See https://github.com/python/cpython/issues/122400 + # for the rationale for protecting against ValueError. # print('Can\'t stat', a_path, ':', why.args[1]) ok = False try: b_stat = os.stat(b_path) - except OSError: + except (OSError, ValueError): # print('Can\'t stat', b_path, ':', why.args[1]) ok = False @@ -280,12 +282,12 @@ def cmpfiles(a, b, common, shallow=True): # Return: # 0 for equal # 1 for different -# 2 for funny cases (can't stat, etc.) +# 2 for funny cases (can't stat, NUL bytes, etc.) # def _cmp(a, b, sh, abs=abs, cmp=cmp): try: return not abs(cmp(a, b, sh)) - except OSError: + except (OSError, ValueError): return 2 |