Standardize future imports.

fchollet · fchollet · commit 04c11f8c13b1 · 2018-01-04T16:49:23.000-08:00
diff --git a/keras/activations.py b/keras/activations.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import six
 import warnings
 from . import backend as K
diff --git a/keras/applications/densenet.py b/keras/applications/densenet.py
@@ -10,8 +10,9 @@
 - [Torch DenseNets](https://github.com/liuzhuang13/DenseNet/blob/master/models/densenet.lua)
 - [TensorNets](https://github.com/taehoonlee/tensornets/blob/master/tensornets/densenets.py)
 """
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import os
 
diff --git a/keras/applications/imagenet_utils.py b/keras/applications/imagenet_utils.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import json
 import warnings
 import numpy as np
diff --git a/keras/applications/inception_resnet_v2.py b/keras/applications/inception_resnet_v2.py
@@ -13,8 +13,9 @@
    Residual Connections on Learning](https://arxiv.org/abs/1602.07261)
 
 """
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import os
 import warnings
diff --git a/keras/applications/inception_v3.py b/keras/applications/inception_v3.py
@@ -10,8 +10,9 @@
 - [Rethinking the Inception Architecture for Computer Vision](http://arxiv.org/abs/1512.00567)
 
 """
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import os
 import warnings
diff --git a/keras/applications/resnet50.py b/keras/applications/resnet50.py
@@ -7,8 +7,9 @@
 
 Adapted from code contributed by BigMoyan.
 """
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import os
 import warnings
diff --git a/keras/applications/vgg16.py b/keras/applications/vgg16.py
@@ -6,8 +6,9 @@
 - [Very Deep Convolutional Networks for Large-Scale Image Recognition](https://arxiv.org/abs/1409.1556)
 
 """
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import os
 import warnings
diff --git a/keras/applications/vgg19.py b/keras/applications/vgg19.py
@@ -6,8 +6,9 @@
 - [Very Deep Convolutional Networks for Large-Scale Image Recognition](https://arxiv.org/abs/1409.1556)
 
 """
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import os
 import warnings
diff --git a/keras/applications/xception.py b/keras/applications/xception.py
@@ -17,8 +17,9 @@
 - [Xception: Deep Learning with Depthwise Separable Convolutions](https://arxiv.org/abs/1610.02357)
 
 """
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import os
 import warnings
diff --git a/keras/backend/cntk_backend.py b/keras/backend/cntk_backend.py
@@ -1,4 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
+
 import cntk as C
 import numpy as np
 from .common import floatx, epsilon, image_dim_ordering, image_data_format
diff --git a/keras/backend/common.py b/keras/backend/common.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import numpy as np
 
 # the type of float to use throughout the session.
diff --git a/keras/backend/tensorflow_backend.py b/keras/backend/tensorflow_backend.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import tensorflow as tf
 from tensorflow.python.training import moving_averages
 from tensorflow.python.ops import tensor_array_ops
diff --git a/keras/backend/theano_backend.py b/keras/backend/theano_backend.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from collections import defaultdict
 from contextlib import contextmanager
 import theano
diff --git a/keras/callbacks.py b/keras/callbacks.py
@@ -1,4 +1,5 @@
 from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
 import os
diff --git a/keras/constraints.py b/keras/constraints.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import six
 from . import backend as K
 from .utils.generic_utils import serialize_keras_object
diff --git a/keras/datasets/boston_housing.py b/keras/datasets/boston_housing.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from ..utils.data_utils import get_file
 import numpy as np
 
diff --git a/keras/datasets/cifar.py b/keras/datasets/cifar.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import sys
 from six.moves import cPickle
 
diff --git a/keras/datasets/cifar10.py b/keras/datasets/cifar10.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from .cifar import load_batch
 from ..utils.data_utils import get_file
 from .. import backend as K
diff --git a/keras/datasets/cifar100.py b/keras/datasets/cifar100.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from .cifar import load_batch
 from ..utils.data_utils import get_file
 from .. import backend as K
diff --git a/keras/datasets/fashion_mnist.py b/keras/datasets/fashion_mnist.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import gzip
 import os
 
diff --git a/keras/datasets/imdb.py b/keras/datasets/imdb.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from ..utils.data_utils import get_file
 from ..preprocessing.sequence import _remove_long_seq
 import numpy as np
diff --git a/keras/datasets/mnist.py b/keras/datasets/mnist.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from ..utils.data_utils import get_file
 import numpy as np
 
diff --git a/keras/datasets/reuters.py b/keras/datasets/reuters.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from ..utils.data_utils import get_file
 from ..preprocessing.sequence import _remove_long_seq
 from six.moves import zip
diff --git a/keras/engine/training.py b/keras/engine/training.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
-from __future__ import print_function
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import warnings
 import copy
diff --git a/keras/initializers.py b/keras/initializers.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import numpy as np
 import six
 from . import backend as K
diff --git a/keras/layers/advanced_activations.py b/keras/layers/advanced_activations.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from .. import activations
 from .. import initializers
diff --git a/keras/layers/convolutional.py b/keras/layers/convolutional.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from .. import backend as K
 from .. import activations
diff --git a/keras/layers/convolutional_recurrent.py b/keras/layers/convolutional_recurrent.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from .. import backend as K
 from .. import activations
diff --git a/keras/layers/core.py b/keras/layers/core.py
@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
 from __future__ import division
+from __future__ import print_function
 
 import numpy as np
 
diff --git a/keras/layers/cudnn_recurrent.py b/keras/layers/cudnn_recurrent.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from .. import backend as K
 from .. import initializers
 from .. import regularizers
diff --git a/keras/layers/embeddings.py b/keras/layers/embeddings.py
@@ -1,4 +1,6 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from .. import backend as K
 from .. import initializers
diff --git a/keras/layers/local.py b/keras/layers/local.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from .. import backend as K
 from .. import activations
diff --git a/keras/layers/merge.py b/keras/layers/merge.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from ..engine.topology import Layer
 from .. import backend as K
 
diff --git a/keras/layers/noise.py b/keras/layers/noise.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from ..engine import Layer
 from .. import backend as K
diff --git a/keras/layers/normalization.py b/keras/layers/normalization.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from ..engine import Layer, InputSpec
 from .. import initializers
diff --git a/keras/layers/pooling.py b/keras/layers/pooling.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 from .. import backend as K
 from ..engine import Layer
diff --git a/keras/layers/recurrent.py b/keras/layers/recurrent.py
@@ -1,5 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import numpy as np
 import warnings
 
diff --git a/keras/layers/wrappers.py b/keras/layers/wrappers.py
@@ -1,5 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
 
 import copy
 from ..engine import Layer
diff --git a/keras/legacy/interfaces.py b/keras/legacy/interfaces.py
@@ -1,5 +1,9 @@
 """Interface converters for Keras 1 support in Keras 2.
 """
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import six
 import warnings
 import functools
diff --git a/keras/legacy/layers.py b/keras/legacy/layers.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import numpy as np
 import types as python_types
 import warnings
diff --git a/keras/legacy/models.py b/keras/legacy/models.py
@@ -1,3 +1,7 @@
+from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 from .layers import Merge
 
 
diff --git a/keras/losses.py b/keras/losses.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import six
 from . import backend as K
 from .utils.generic_utils import deserialize_keras_object
diff --git a/keras/metrics.py b/keras/metrics.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import six
 from . import backend as K
 from .losses import mean_squared_error
diff --git a/keras/models.py b/keras/models.py
@@ -1,5 +1,6 @@
 # -*- coding: utf-8 -*-
 from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
 import warnings
diff --git a/keras/optimizers.py b/keras/optimizers.py
@@ -1,4 +1,7 @@
 from __future__ import absolute_import
+from __future__ import division
+from __future__ import print_function
+
 import six
 import copy
 from six.moves import zip
diff --git a/keras/preprocessing/image.py b/keras/preprocessing/image.py
@@ -1,8 +1,10 @@
 """Fairly basic set of tools for real-time data augmentation on image data.
+
 Can easily be extended to include new transformations,
 new preprocessing methods, etc...
 """
 from __future__ import absolute_import
+from __future__ import division
 from __future__ import print_function
 
 import numpy as np
diff --git a/keras/preprocessing/sequence.py b/keras/preprocessing/sequence.py
diff --git a/keras/preprocessing/text.py b/keras/preprocessing/text.py
diff --git a/keras/regularizers.py b/keras/regularizers.py
diff --git a/keras/utils/conv_utils.py b/keras/utils/conv_utils.py
diff --git a/keras/utils/data_utils.py b/keras/utils/data_utils.py
diff --git a/keras/utils/generic_utils.py b/keras/utils/generic_utils.py
diff --git a/keras/utils/io_utils.py b/keras/utils/io_utils.py
diff --git a/keras/utils/layer_utils.py b/keras/utils/layer_utils.py
diff --git a/keras/utils/np_utils.py b/keras/utils/np_utils.py
diff --git a/keras/utils/test_utils.py b/keras/utils/test_utils.py
diff --git a/keras/utils/training_utils.py b/keras/utils/training_utils.py
diff --git a/keras/utils/vis_utils.py b/keras/utils/vis_utils.py
diff --git a/keras/wrappers/scikit_learn.py b/keras/wrappers/scikit_learn.py
