aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/tools/test
diff options
context:
space:
mode:
authorGravatar Jacques Pienaar <jpienaar@google.com>2018-03-15 12:58:08 -0700
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2018-03-15 13:03:19 -0700
commitccd8079e579604547f4b4d8a6b061cfdc6ce49bf (patch)
tree0d498e84ca32a101afcada0993a30a5e3b0452a2 /tensorflow/tools/test
parent61032e9ca7bf9849cb65db9b646381d124080856 (diff)
Merge changes from github.
PiperOrigin-RevId: 189231636
Diffstat (limited to 'tensorflow/tools/test')
-rw-r--r--tensorflow/tools/test/upload_test_benchmarks.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tensorflow/tools/test/upload_test_benchmarks.py b/tensorflow/tools/test/upload_test_benchmarks.py
index 77cc9f75f7..edd093510e 100644
--- a/tensorflow/tools/test/upload_test_benchmarks.py
+++ b/tensorflow/tools/test/upload_test_benchmarks.py
@@ -88,6 +88,7 @@ import os
import shutil
from google.cloud import datastore
+from six import text_type
def is_real_file(dirpath, fname):
@@ -150,7 +151,7 @@ def upload_benchmark_data(client, data):
"""
test_result = json.loads(data)
- test_name = unicode(test_result["name"])
+ test_name = text_type(test_result["name"])
start_time = datetime.datetime.utcfromtimestamp(
float(test_result["startTime"]))
batch = []
@@ -162,7 +163,7 @@ def upload_benchmark_data(client, data):
t_val.update({
"test": test_name,
"start": start_time,
- "info": unicode(data)
+ "info": text_type(data)
})
batch.append(t_val)
@@ -170,7 +171,7 @@ def upload_benchmark_data(client, data):
# the attribute to be fetched and displayed. The full entry information is
# also stored as a non-indexed JSON blob.
for ent in test_result["entries"].get("entry", []):
- ent_name = unicode(ent["name"])
+ ent_name = text_type(ent["name"])
e_key = client.key("Entry")
e_val = datastore.Entity(e_key, exclude_from_indexes=["info"])
e_val.update({
@@ -178,7 +179,7 @@ def upload_benchmark_data(client, data):
"start": start_time,
"entry": ent_name,
"timing": ent["wallTime"],
- "info": unicode(json.dumps(ent))
+ "info": text_type(json.dumps(ent))
})
batch.append(e_val)