aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/python/platform/googletest.py
diff options
context:
space:
mode:
authorGravatar Vijay Vasudevan <vrv@google.com>2015-11-09 10:11:07 -0800
committerGravatar Vijay Vasudevan <vrv@google.com>2015-11-09 10:11:07 -0800
commit61d3a958d6d83cb6037490d933b47621cc4009cc (patch)
tree20630337ec30cbc6d974730d3bfdd22508f6e257 /tensorflow/python/platform/googletest.py
parent9f64983a8458700ba1aec613a755e8264b1608e0 (diff)
TensorFlow: Initial steps towards python3 support, some documentation
bug fixes -- reindents to 2 for some of the files to match our internal requirements. Thanks to Martin Andrews for the basic_usage.md suggested fix via Gerrit. Base CL: 107394029
Diffstat (limited to 'tensorflow/python/platform/googletest.py')
-rw-r--r--tensorflow/python/platform/googletest.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/tensorflow/python/platform/googletest.py b/tensorflow/python/platform/googletest.py
index ca22ec6e6b..2b4808552a 100644
--- a/tensorflow/python/platform/googletest.py
+++ b/tensorflow/python/platform/googletest.py
@@ -1,9 +1,10 @@
"""Switch between depending on googletest or unittest."""
+from __future__ import absolute_import
# pylint: disable=unused-import
# pylint: disable=g-import-not-at-top
# pylint: disable=wildcard-import
import tensorflow.python.platform
-import control_imports
+from . import control_imports
if control_imports.USE_OSS and control_imports.OSS_GOOGLETEST:
from tensorflow.python.platform.default._googletest import *
else: