Fix a number of deserialization error messages. While print(string, obj) is valid syntax, ValueError(string, obj) is not.

PiperOrigin-RevId: 309877228
Change-Id: Id6f7f8b0207a0c432c232c3bf4c80eb6c1ae5471

tensorflow/python/keras/activations.py

@@ -487,4 +487,4 @@ def get(identifier):
   else:
     raise TypeError(
         'Could not interpret activation function identifier: {}'.format(
-            repr(identifier)))
+            identifier))

tensorflow/python/keras/losses.py

@@ -1880,8 +1880,8 @@ def get(identifier):
   elif callable(identifier):
     return identifier
   else:
-    raise ValueError('Could not interpret '
+    raise ValueError(
-                     'loss function identifier:', identifier)
+        'Could not interpret loss function identifier: {}'.format(identifier))
 
 
 LABEL_DTYPES_FOR_LOSSES = {

tensorflow/python/keras/losses_test.py

@@ -234,6 +234,10 @@ class KerasLossesTest(test.TestCase, parameterized.TestCase):
     with self.assertRaisesRegexp(ValueError, 'Invalid Reduction Key Bar.'):
       mse_obj(y, y)
 
+  def test_deserialization_error(self):
+    with self.assertRaisesRegex(ValueError, 'Could not interpret loss'):
+      losses.get(0)
+
 
 @combinations.generate(combinations.combine(mode=['graph', 'eager']))
 class MeanSquaredErrorTest(test.TestCase):

tensorflow/python/keras/metrics.py

@@ -3479,9 +3479,8 @@ def get(identifier):
   elif callable(identifier):
     return identifier
   else:
-    error_msg = 'Could not interpret metric function identifier: {}'.format(
+    raise ValueError(
-        identifier)
+        'Could not interpret metric function identifier: {}'.format(identifier))
-    raise ValueError(error_msg)
 
 
 def is_built_in(cls):

tensorflow/python/keras/optimizers.py

@@ -899,4 +899,5 @@ def get(identifier):
     config = {'class_name': str(identifier), 'config': {}}
     return deserialize(config)
   else:
-    raise ValueError('Could not interpret optimizer identifier:', identifier)
+    raise ValueError(
+        'Could not interpret optimizer identifier: {}'.format(identifier))

tensorflow/python/keras/optimizers_test.py

@@ -253,6 +253,9 @@ class KerasOptimizersTest(keras_parameterized.TestCase):
         batch_size=5,
         verbose=0)
 
+  def test_deserialization_error(self):
+    with self.assertRaisesRegex(ValueError, 'Could not interpret optimizer'):
+      keras.optimizers.get(0)
 
 if __name__ == '__main__':
   test.main()

tensorflow/python/keras/regularizers.py

@@ -312,4 +312,5 @@ def get(identifier):
   elif callable(identifier):
     return identifier
   else:
-    raise ValueError('Could not interpret regularizer identifier:', identifier)
+    raise ValueError(
+        'Could not interpret regularizer identifier: {}'.format(identifier))

tensorflow/python/keras/regularizers_test.py

@@ -199,6 +199,10 @@ class KerasRegularizersTest(keras_parameterized.TestCase,
     # - 4 from activity regularizers on the shared_dense layer.
     self.assertLen(model.losses, 9)
 
+  def test_deserialization_error(self):
+    with self.assertRaisesRegex(ValueError, 'Could not interpret regularizer'):
+      keras.regularizers.get(0)
+
 
 if __name__ == '__main__':
   test.main()