Skip to content

Updated enum + file_cmp library + tests - v3.13.10 #6606

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
youknowone merged 6 commits into from
Jan 2, 2026
Merged

Updated enum + file_cmp library + tests - v3.13.10 #6606

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b3cd779
Updated enum library
terryluan12 Dec 31, 2025
404bdbf
Updated filecmp + file_cmp test
terryluan12 Dec 31, 2025
c1b6e72
Removed unneeded @unittest.expectedFailures
terryluan12 Dec 31, 2025
5164384
Updated unexpected success in enum test
terryluan12 Jan 1, 2026
945530e
Merge branch 'base_main' into update_enum
terryluan12 Jan 2, 2026
2c6a378
Fixed unexpected success in test_filecmp
terryluan12 Jan 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
473 changes: 287 additions & 186 deletions Lib/enum.py
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 15 additions & 8 deletions Lib/filecmp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,12 +88,15 @@ def _do_cmp(f1, f2):
class dircmp:
"""A class that manages the comparison of 2 directories.

dircmp(a, b, ignore=None, hide=None)
dircmp(a, b, ignore=None, hide=None, *, shallow=True)
A and B are directories.
IGNORE is a list of names to ignore,
defaults to DEFAULT_IGNORES.
HIDE is a list of names to hide,
defaults to [os.curdir, os.pardir].
SHALLOW specifies whether to just check the stat signature (do not read
the files).
defaults to True.

High level usage:
x = dircmp(dir1, dir2)
Expand Down Expand Up @@ -121,7 +124,7 @@ class dircmp:
in common_dirs.
"""

def __init__(self, a, b, ignore=None, hide=None): # Initialize
def __init__(self, a, b, ignore=None, hide=None, *, shallow=True): # Initialize
self.left = a
self.right = b
if hide is None:
Expand All @@ -132,6 +135,7 @@ def __init__(self, a, b, ignore=None, hide=None): # Initialize
self.ignore = DEFAULT_IGNORES
else:
self.ignore = ignore
self.shallow = shallow

def phase0(self): # Compare everything except common subdirectories
self.left_list = _filter(os.listdir(self.left),
Expand Down Expand Up @@ -160,12 +164,14 @@ def phase2(self): # Distinguish files, directories, funnies
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

Expand All @@ -184,7 +190,7 @@ def phase2(self): # Distinguish files, directories, funnies
self.common_funny.append(x)

def phase3(self): # Find out differences between common files
xx = cmpfiles(self.left, self.right, self.common_files)
xx = cmpfiles(self.left, self.right, self.common_files, self.shallow)
self.same_files, self.diff_files, self.funny_files = xx

def phase4(self): # Find out differences between common subdirectories
Expand All @@ -196,7 +202,8 @@ def phase4(self): # Find out differences between common subdirectories
for x in self.common_dirs:
a_x = os.path.join(self.left, x)
b_x = os.path.join(self.right, x)
self.subdirs[x] = self.__class__(a_x, b_x, self.ignore, self.hide)
self.subdirs[x] = self.__class__(a_x, b_x, self.ignore, self.hide,
shallow=self.shallow)

def phase4_closure(self): # Recursively call phase4() on subdirectories
self.phase4()
Expand Down Expand Up @@ -280,12 +287,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


Expand Down
1 change: 0 additions & 1 deletion Lib/test/test_ast/test_ast.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,6 @@ def test_constant_as_unicode_name(self):
f"identifier field can't represent '{constant[0]}' constant"):
ast.parse(constant[1], mode="eval")

@unittest.expectedFailure # TODO: RUSTPYTHON
def test_precedence_enum(self):
class _Precedence(enum.IntEnum):
"""Precedence table that originated from python grammar."""
Expand Down
Loading
Loading