[llvm] r329024 - [lit] Attempt to fix builtin diff code for Python 2

[Reid Kleckner via llvm-commits]

Author: rnk
Date: Mon Apr  2 15:19:42 2018
New Revision: 329024

URL: http://llvm.org/viewvc/llvm-project?rev=329024&view=rev
Log:
[lit] Attempt to fix builtin diff code for Python 2

Modified:
    llvm/trunk/utils/lit/lit/TestRunner.py

Modified: llvm/trunk/utils/lit/lit/TestRunner.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/lit/lit/TestRunner.py?rev=329024&r1=329023&r2=329024&view=diff
==============================================================================
--- llvm/trunk/utils/lit/lit/TestRunner.py (original)
+++ llvm/trunk/utils/lit/lit/TestRunner.py Mon Apr  2 15:19:42 2018
@@ -12,6 +12,7 @@ import shutil
 import tempfile
 import threading
 
+import io
 try:
     from StringIO import StringIO
 except ImportError:
@@ -388,6 +389,8 @@ def executeBuiltinDiff(cmd, cmd_shenv):
     def compareTwoFiles(filepaths):
         filelines = []
         for file in filepaths:
+            compare_bytes = False
+            encoding = None
             try:
                 with open(file, 'r') as f:
                     filelines.append(f.readlines())