aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--tensorflow/contrib/distribute/python/mirrored_strategy.py2
-rw-r--r--tensorflow/contrib/lite/schema/upgrade_schema.py6
-rw-r--r--tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py6
-rw-r--r--tensorflow/python/framework/errors_impl.py4
-rw-r--r--tensorflow/python/ops/distributions/distribution.py4
-rw-r--r--tensorflow/python/util/deprecation.py4
6 files changed, 13 insertions, 13 deletions
diff --git a/tensorflow/contrib/distribute/python/mirrored_strategy.py b/tensorflow/contrib/distribute/python/mirrored_strategy.py
index 3c1760c03c..e3376a0636 100644
--- a/tensorflow/contrib/distribute/python/mirrored_strategy.py
+++ b/tensorflow/contrib/distribute/python/mirrored_strategy.py
@@ -317,7 +317,7 @@ class MirroredStrategy(distribute_lib.DistributionStrategy):
self._devices = [device_util.resolve(d) for d in devices]
self._canonical_device_set = set(self._devices)
self._device_index = values.PerDevice(
- dict((d, i) for i, d in enumerate(devices)))
+ {d: i for i, d in enumerate(devices)})
self._cross_tower_ops = cross_tower_ops
self._prefetch_on_device = prefetch_on_device
# TODO(yuefengz): consider setting the default device.
diff --git a/tensorflow/contrib/lite/schema/upgrade_schema.py b/tensorflow/contrib/lite/schema/upgrade_schema.py
index e0b36d3d3e..a2ddf62950 100644
--- a/tensorflow/contrib/lite/schema/upgrade_schema.py
+++ b/tensorflow/contrib/lite/schema/upgrade_schema.py
@@ -99,9 +99,9 @@ class Converter(object):
# dispatch function table.
self._schemas.sort()
self._new_version, self._new_schema = self._schemas[-1][:2]
- self._upgrade_dispatch = dict(
- (version, dispatch)
- for version, unused1, unused2, dispatch in self._schemas)
+ self._upgrade_dispatch = {
+ version: dispatch
+ for version, unused1, unused2, dispatch in self._schemas}
def _Read(self, input_file, schema, raw_binary=False):
"""Read a tflite model assuming the given flatbuffer schema.
diff --git a/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py b/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
index 39d75a0806..53e4f23a7c 100644
--- a/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
+++ b/tensorflow/contrib/training/python/training/sequence_queueing_state_saver.py
@@ -988,14 +988,14 @@ class SequenceQueueingStateSaver(object):
assert isinstance(sequences, dict)
assert isinstance(context, dict)
assert isinstance(states, dict)
- self._name_to_index = dict(
- (name, ix)
+ self._name_to_index = {
+ name: ix
for (ix, name) in enumerate([
"__length", "__total_length", "__next_key", "__sequence",
"__sequence_count"
] + ["__sequence__%s" % k for k in sequences.keys()] + [
"__context__%s" % k for k in context.keys()
- ] + ["__state__%s" % k for k in states.keys()]))
+ ] + ["__state__%s" % k for k in states.keys()])}
self._index_to_name = [
name
for (name, _) in sorted(
diff --git a/tensorflow/python/framework/errors_impl.py b/tensorflow/python/framework/errors_impl.py
index eff3831464..9f973de400 100644
--- a/tensorflow/python/framework/errors_impl.py
+++ b/tensorflow/python/framework/errors_impl.py
@@ -475,8 +475,8 @@ _CODE_TO_EXCEPTION_CLASS = {
c_api.PyExceptionRegistry_Init(_CODE_TO_EXCEPTION_CLASS)
-_EXCEPTION_CLASS_TO_CODE = dict((
- (class_, code) for (code, class_) in _CODE_TO_EXCEPTION_CLASS.items()))
+_EXCEPTION_CLASS_TO_CODE = {
+ class_: code for code, class_ in _CODE_TO_EXCEPTION_CLASS.items()}
@tf_export("errors.exception_type_from_error_code")
diff --git a/tensorflow/python/ops/distributions/distribution.py b/tensorflow/python/ops/distributions/distribution.py
index c03ef967e6..ddf9442cd2 100644
--- a/tensorflow/python/ops/distributions/distribution.py
+++ b/tensorflow/python/ops/distributions/distribution.py
@@ -526,8 +526,8 @@ class Distribution(_BaseDistribution):
# Remove "self", "__class__", or other special variables. These can appear
# if the subclass used:
# `parameters = dict(locals())`.
- return dict((k, v) for k, v in self._parameters.items()
- if not k.startswith("__") and k != "self")
+ return {k: v for k, v in self._parameters.items()
+ if not k.startswith("__") and k != "self"}
@property
def reparameterization_type(self):
diff --git a/tensorflow/python/util/deprecation.py b/tensorflow/python/util/deprecation.py
index 74e1fb227f..c43589f5c4 100644
--- a/tensorflow/python/util/deprecation.py
+++ b/tensorflow/python/util/deprecation.py
@@ -393,8 +393,8 @@ def deprecated_args(date, instructions, *deprecated_arg_names_or_tuples,
Returns:
Dictionary from arg_name to DeprecatedArgSpec.
"""
- arg_name_to_pos = dict(
- (name, pos) for (pos, name) in enumerate(arg_spec.args))
+ arg_name_to_pos = {
+ name: pos for pos, name in enumerate(arg_spec.args)}
deprecated_positional_args = {}
for arg_name, spec in iter(names_to_ok_vals.items()):
if arg_name in arg_name_to_pos: