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

[Joel E. Denny via llvm-commits]

Author: jdenny
Date: Sat Oct 12 11:51:18 2019
New Revision: 374677

URL: http://llvm.org/viewvc/llvm-project?rev=374677&view=rev
Log:
Revert r374665: "[lit] Try yet again to fix new tests that fail on Windows bots"

This series of patches still breaks a Windows bot.

Modified:
    llvm/trunk/utils/lit/lit/builtin_commands/diff.py

Modified: llvm/trunk/utils/lit/lit/builtin_commands/diff.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/builtin_commands/diff.py?rev=374677&r1=374676&r2=374677&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/builtin_commands/diff.py (original)
+++ llvm/trunk/utils/lit/lit/builtin_commands/diff.py Sat Oct 12 11:51:18 2019
@@ -95,9 +95,6 @@ def compareTwoTextFiles(flags, filepaths
     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