aboutsummaryrefslogtreecommitdiffhomepage
path: root/tensorflow/__init__.py
diff options
context:
space:
mode:
authorGravatar Benoit Steiner <bsteiner@google.com>2016-11-09 13:14:03 -0800
committerGravatar TensorFlower Gardener <gardener@tensorflow.org>2016-11-09 13:48:22 -0800
commita771598ad83ca33eb42594d7e804859371ba4ca9 (patch)
tree753237f3b4d22e1760084df1ea37975076d387ea /tensorflow/__init__.py
parentf0e9bd3c55868eb0a1f61f8cfb2b94ce011e47b4 (diff)
Merge changes from github.
Change: 138675832
Diffstat (limited to 'tensorflow/__init__.py')
-rw-r--r--tensorflow/__init__.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/tensorflow/__init__.py b/tensorflow/__init__.py
index ec7cd91e7e..92d390a976 100644
--- a/tensorflow/__init__.py
+++ b/tensorflow/__init__.py
@@ -15,13 +15,14 @@
# Bring in all of the public TensorFlow interface into this
# module.
-# pylint: disable=wildcard-import
+
from __future__ import absolute_import
from __future__ import division
from __future__ import print_function
+# pylint: disable=wildcard-import
from tensorflow.python import *
-
+# pylint: enable=wildcard-import
# Lazily import the `tf.contrib` module. This avoids loading all of the
# dependencies of `tf.contrib` at `import tensorflow` time.