Handle CRLF lines in tool_driver.py

diff --git a/tool_driver.py b/tool_driver.py
index 4cbcc374f5c59ec0be4ab224d4a61b82965d8c76..962db1e09b32baf3cfa106e4bfd96e2b85acff62 100755 (executable)
--- a/tool_driver.py
+++ b/tool_driver.py
@@ -81,7 +81,7 @@ class ToolDriver(Driver):
         args = refStream.readline().split()
         cmd = [self.options.apitrace] + args
         cwd = os.path.dirname(os.path.abspath(refScript))
         args = refStream.readline().split()
         cmd = [self.options.apitrace] + args
         cwd = os.path.dirname(os.path.abspath(refScript))

-        p = popen(cmd, cwd=cwd, stdout=subprocess.PIPE)
+        p = popen(cmd, cwd=cwd, stdout=subprocess.PIPE, universal_newlines=True)

 
         comparer = AsciiComparer(p.stdout, refStream, self.options.verbose)
         comparer.compare()
 
         comparer = AsciiComparer(p.stdout, refStream, self.options.verbose)
         comparer.compare()