From a771598ad83ca33eb42594d7e804859371ba4ca9 Mon Sep 17 00:00:00 2001 From: Benoit Steiner Date: Wed, 9 Nov 2016 13:14:03 -0800 Subject: Merge changes from github. Change: 138675832 --- tensorflow/__init__.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tensorflow/__init__.py') 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. -- cgit v1.2.3