commit 03b8b2caada96eff5d35347a9199c5e7e25a50b5
author Paladox none <thomasmulhall410@yahoo.com> Fri Mar 02 15:48:43 2018 +0000
committer David Pursehouse <dpursehouse@collab.net> Thu Mar 08 15:36:20 2018 +0900
tree cccdecaeb692e0cfdc0d2fa5bd40c9ad2be711e7
parent de255d9b8bfd8426206344e701eab002f2149765

license and doc: Add support for python3

With homebrew's recent change of making python3 the default
over python2, lets support python3.

Bug: Issue 8474
Change-Id: I8dba441c8d717ae06d156c9201a02926884fd5f0

Documentation/replace_macros.py

diff --git a/Documentation/replace_macros.py b/Documentation/replace_macros.py
index 2996a98..c76d133 100755
--- a/Documentation/replace_macros.py
+++ b/Documentation/replace_macros.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 # coding=utf-8
 # Copyright (C) 2013 The Android Open Source Project
 #
@@ -229,12 +229,16 @@
 options, _ = opts.parse_args()
 
 try:
-  out_file = open(options.out, 'w')
-  src_file = open(options.src, 'r')
+  try:
+    out_file = open(options.out, 'w', errors='ignore')
+    src_file = open(options.src, 'r', errors='ignore')
+  except TypeError:
+    out_file = open(options.out, 'w')
+    src_file = open(options.src, 'r')
   last_line = ''
   ignore_next_line = False
   last_title = ''
-  for line in src_file.xreadlines():
+  for line in src_file:
     if PAT_GERRIT.match(last_line):
       # Case of "GERRIT\n------" at the footer
       out_file.write(GERRIT_UPLINK)

tools/bzl/license-map.py

diff --git a/tools/bzl/license-map.py b/tools/bzl/license-map.py
index 1c8db72..74a84cc 100644
--- a/tools/bzl/license-map.py
+++ b/tools/bzl/license-map.py
@@ -113,8 +113,13 @@
   print()
   print("[[%s_license]]" % safename)
   print("----")
-  with open(n[2:].replace(":", "/")) as fd:
-    copyfileobj(fd, stdout)
+  filename = n[2:].replace(":", "/")
+  try:
+    with open(filename, errors='ignore') as fd:
+      copyfileobj(fd, stdout)
+  except TypeError:
+    with open(filename) as fd:
+      copyfileobj(fd, stdout)
   print()
   print("----")
   print()

tools/bzl/license.bzl

diff --git a/tools/bzl/license.bzl b/tools/bzl/license.bzl
index 3578173..38dfbe5 100644
--- a/tools/bzl/license.bzl
+++ b/tools/bzl/license.bzl
@@ -25,7 +25,7 @@
   # post process the XML into our favorite format.
   native.genrule(
     name = "gen_license_txt_" + name,
-    cmd = "python2 $(location //tools/bzl:license-map.py) %s %s > $@" % (" ".join(opts), " ".join(xmls)),
+    cmd = "python $(location //tools/bzl:license-map.py) %s %s > $@" % (" ".join(opts), " ".join(xmls)),
     outs = [ name + ".txt" ],
     tools = tools,
     **kwargs