Improve error messages for dtypes.py. Tell which argument value is not right.
PiperOrigin-RevId: 407383948
Change-Id: I9b47d9335774304b2a8fabb1d4385fdbb48b8628
diff --git a/tensorflow/python/data/kernel_tests/from_generator_test.py b/tensorflow/python/data/kernel_tests/from_generator_test.py
index 117b36b..2c89758 100644
--- a/tensorflow/python/data/kernel_tests/from_generator_test.py
+++ b/tensorflow/python/data/kernel_tests/from_generator_test.py
@@ -494,7 +494,8 @@
yield [20]
with self.assertRaisesRegex(
- TypeError, r"Cannot convert value \[tf.int64\] to a TensorFlow DType"):
+ TypeError, r"Cannot convert the argument `type_value`: "
+ r"\[tf.int64\] to a TensorFlow DType"):
dataset_ops.Dataset.from_generator(
generator, output_types=[dtypes.int64])
diff --git a/tensorflow/python/framework/dtypes.py b/tensorflow/python/framework/dtypes.py
index bfd3331..e5b7d92 100644
--- a/tensorflow/python/framework/dtypes.py
+++ b/tensorflow/python/framework/dtypes.py
@@ -718,4 +718,5 @@
if isinstance(type_value, _dtypes.DType):
return _INTERN_TABLE[type_value.as_datatype_enum]
- raise TypeError(f"Cannot convert value {type_value!r} to a TensorFlow DType.")
+ raise TypeError(f"Cannot convert the argument `type_value`: {type_value!r} "
+ "to a TensorFlow DType.")
diff --git a/tensorflow/python/kernel_tests/control_flow/py_func_test.py b/tensorflow/python/kernel_tests/control_flow/py_func_test.py
index 8debde9..97f69e2 100644
--- a/tensorflow/python/kernel_tests/control_flow/py_func_test.py
+++ b/tensorflow/python/kernel_tests/control_flow/py_func_test.py
@@ -807,7 +807,7 @@
def testUnsupportedToutType(self):
with self.assertRaisesRegex(
- TypeError, "Cannot convert value {} to a TensorFlow DType."):
+ TypeError, "Cannot convert .* to a TensorFlow DType."):
script_ops.eager_py_func(lambda x: x, [1], [{}])
def testRaggedTensorArg(self):
