xcresult_logs.py: change the UnicodeEncodeError avoidance strategy to instead just encode to UTF-8 in a relaxed manner and write the resulting bytes directly to stdout

Author: dconeybe

scripts/xcresult_logs.py

@@ -65,18 +65,11 @@ def main():
     log_id = find_log_id(xcresult_path)
     log = export_log(xcresult_path, log_id)
 
-    # Avoid UnicodeEncodeError by adapting the code example from
-    # https://docs.python.org/3/library/sys.html#sys.displayhook
-    try:
-      sys.stdout.write(log)
-    except UnicodeEncodeError:
-      log_encoded = log.encode(sys.stdout.encoding, errors='backslashreplace')
-      if hasattr(sys.stdout, 'buffer'):
-        sys.stdout.flush()
-        sys.stdout.buffer.write(log_encoded)
-      else:
-        log_decoded = log_encoded.decode(sys.stdout.encoding, errors='strict')
-        sys.stdout.write(log_decoded)
+    # Avoid a potential UnicodeEncodeError raised by sys.stdout.write() by
+    # doing a relaxed encoding ourselves and writing the resulting bytes.
+    log_encoded = log.encode('utf8', errors='backslashreplace')
+    sys.stdout.flush()
+    sys.stdout.buffer.write(log_encoded)
 
 
 # Most flags on the xcodebuild command-line are uninteresting, so only pull