commit 7d27c9c8f2f7d2184b90727bbf1b82fdda20dc23
author David Pursehouse <dpursehouse@collab.net> Wed Feb 28 23:26:33 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 28 23:26:33 2018 +0000
tree d3c7f8d8e1d7fa8755b4788eeb6ad3c6f5f6752a
parent e5ed30f36fc99b56be868d5ff9ba4283ae782ea5
parent 01fbe50f3a5a2823a0ec8d47f50676b0a3fc5464

Merge "Revert "Make license-map compatible to both python2 and python3""

tools/bzl/license-map.py

diff --git a/tools/bzl/license-map.py b/tools/bzl/license-map.py
index 79aed37..1c8db72 100644
--- a/tools/bzl/license-map.py
+++ b/tools/bzl/license-map.py
@@ -6,8 +6,8 @@
 
 import argparse
 from collections import defaultdict
+from shutil import copyfileobj
 from sys import stdout, stderr
-import os
 import xml.etree.ElementTree as ET
 
 
@@ -113,8 +113,8 @@
   print()
   print("[[%s_license]]" % safename)
   print("----")
-  with open(n[2:].replace(":", "/"), "rb") as input:
-    os.write(stdout.fileno(), input.read(-1))
+  with open(n[2:].replace(":", "/")) 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 38dfbe5..3578173 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 = "python $(location //tools/bzl:license-map.py) %s %s > $@" % (" ".join(opts), " ".join(xmls)),
+    cmd = "python2 $(location //tools/bzl:license-map.py) %s %s > $@" % (" ".join(opts), " ".join(xmls)),
     outs = [ name + ".txt" ],
     tools = tools,
     **kwargs