From: Joel E. Denny <jdenny.ornl@gmail.com>
Date: Sat, 12 Oct 2019 18:51:18 +0000 (+0000)
Subject: Revert r374665: "[lit] Try yet again to fix new tests that fail on Windows bots"
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8076b72b3e7bd1650d629d1eeec53903463f9e1;p=llvm

Revert r374665: "[lit] Try yet again to fix new tests that fail on Windows bots"

This series of patches still breaks a Windows bot.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@374677 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/utils/lit/lit/builtin_commands/diff.py b/utils/lit/lit/builtin_commands/diff.py
index ee933d8e59e..f413f87425c 100644
--- a/utils/lit/lit/builtin_commands/diff.py
+++ b/utils/lit/lit/builtin_commands/diff.py
@@ -95,9 +95,6 @@ def compareTwoTextFiles(flags, filepaths, filelines_bin, encoding):
     func = difflib.unified_diff if flags.unified_diff else difflib.context_diff
     for diff in func(filelines[0], filelines[1], filepaths[0], filepaths[1],
                      n = flags.num_context_lines):
-        if hasattr(diff, 'decode'):
-            # python 2.7
-            diff = diff.decode()
         sys.stdout.write(diff)
         exitCode = 1
     return exitCode