Skip to content

[lit] Remove python 2.7 code paths in builtin diff #157558

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
merged 4 commits into from
Sep 9, 2025
Merged

[lit] Remove python 2.7 code paths in builtin diff #157558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4b6cd10
[𝘀𝗽𝗿] changes to main this commit is based on
boomanaiden154 Sep 8, 2025
74e54d7
[𝘀𝗽𝗿] initial version
boomanaiden154 Sep 8, 2025
8c3530c
[𝘀𝗽𝗿] changes introduced through rebase
boomanaiden154 Sep 9, 2025
22574f9
rebase+release notes
boomanaiden154 Sep 9, 2025
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
1 change: 1 addition & 0 deletions llvm/docs/ReleaseNotes.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,7 @@ Changes to the LLVM tools
---------------------------------

* `llvm-readelf` now dumps all hex format values in lower-case mode.
* Some code paths for supporting Python 2.7 in `llvm-lit` have been removed.

Changes to LLDB
---------------------------------
Expand Down
41 changes: 10 additions & 31 deletions llvm/utils/lit/lit/builtin_commands/diff.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,30 +59,15 @@ def compareTwoFiles(flags, filepaths):

def compareTwoBinaryFiles(flags, filepaths, filelines):
exitCode = 0
if hasattr(difflib, "diff_bytes"):
# python 3.5 or newer
diffs = difflib.diff_bytes(
difflib.unified_diff,
filelines[0],
filelines[1],
filepaths[0].encode(),
filepaths[1].encode(),
n=flags.num_context_lines,
)
diffs = [diff.decode(errors="backslashreplace") for diff in diffs]
else:
# python 2.7
if flags.unified_diff:
func = difflib.unified_diff
else:
func = difflib.context_diff
diffs = func(
filelines[0],
filelines[1],
filepaths[0],
filepaths[1],
n=flags.num_context_lines,
)
diffs = difflib.diff_bytes(
difflib.unified_diff,
filelines[0],
filelines[1],
filepaths[0].encode(),
filepaths[1].encode(),
n=flags.num_context_lines,
)
diffs = [diff.decode(errors="backslashreplace") for diff in diffs]

for diff in diffs:
sys.stdout.write(to_string(diff))
Expand Down Expand Up @@ -230,14 +215,8 @@ def compareDirTrees(flags, dir_trees, base_paths=["", ""]):

def main(argv):
if sys.platform == "win32":
if hasattr(sys.stdout, "buffer"):
# python 3
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, newline="\n")
else:
# python 2.7
import msvcrt
sys.stdout = io.TextIOWrapper(sys.stdout.buffer, newline="\n")

msvcrt.setmode(sys.stdout.fileno(), os.O_BINARY)
args = argv[1:]
try:
opts, args = getopt.gnu_getopt(args, "wbuI:U:r", ["strip-trailing-cr"])
Expand Down
Loading