From 1eea5ad3f9a622411117f7208d308055b0707d0f Mon Sep 17 00:00:00 2001 From: Anna R Date: Sun, 8 Apr 2018 15:42:16 -0700 Subject: Automated g4 rollback of changelist 191360905 PiperOrigin-RevId: 192065431 --- tensorflow/__init__.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'tensorflow/__init__.py') diff --git a/tensorflow/__init__.py b/tensorflow/__init__.py index 78ad6aec19..c8683e3976 100644 --- a/tensorflow/__init__.py +++ b/tensorflow/__init__.py @@ -20,14 +20,19 @@ from __future__ import absolute_import from __future__ import division from __future__ import print_function +# pylint: disable=g-bad-import-order +from tensorflow.python import pywrap_tensorflow # pylint: disable=unused-import # pylint: disable=wildcard-import -from tensorflow.python import * # pylint: disable=redefined-builtin +from tensorflow.tools.api.generator.api import * # pylint: disable=redefined-builtin # pylint: enable=wildcard-import from tensorflow.python.util.lazy_loader import LazyLoader contrib = LazyLoader('contrib', globals(), 'tensorflow.contrib') del LazyLoader +from tensorflow.python.platform import flags # pylint: disable=g-import-not-at-top +app.flags = flags # pylint: disable=undefined-variable + del absolute_import del division del print_function -- cgit v1.2.3