Bug 1275356 - Fix newlines in gen-css-properties.py on Windows; r?chmanchester draft
authorMike Shal <mshal@mozilla.com>
Tue, 24 May 2016 10:49:51 -0400
changeset 370450 7312cb187f7ff6c7c5ab2b6e5d5dbcf0ff683e0a
parent 369317 16663eb3dcfa759f25b5e27b101bc79270c156f2
child 521749 fb879c1c8cc871ad54309a1531c7d852fce12fe4
push id19060
push userbmo:mshal@mozilla.com
push dateTue, 24 May 2016 18:47:54 +0000
reviewerschmanchester
bugs1275356
milestone49.0a1
Bug 1275356 - Fix newlines in gen-css-properties.py on Windows; r?chmanchester MozReview-Commit-ID: 9BDStGNIEqg
layout/style/test/gen-css-properties.py
--- a/layout/style/test/gen-css-properties.py
+++ b/layout/style/test/gen-css-properties.py
@@ -7,15 +7,18 @@ from __future__ import print_function
 import os
 import sys
 import subprocess
 
 def main(output, css_properties, exe):
     # moz.build passes in the exe name without any path, so to run it we need to
     # prepend the './'
     run_exe = exe if os.path.isabs(exe) else './%s' % exe
-    data = subprocess.check_output([run_exe])
+
+    # Use universal_newlines so everything is '\n', which gets converted to
+    # '\r\n' when writing out the file in Windows.
+    data = subprocess.check_output([run_exe], universal_newlines=True)
     with open(css_properties) as f:
         data += f.read()
     output.write(data)
 
 if __name__ == '__main__':
     main(sys.stdout, *sys.argv[1:])