Refine formatting, fix typo, and use f-strings in json_utils.py

Author: atheendre130505

sdks/python/apache_beam/yaml/json_utils.py

@@ -314,20 +314,20 @@ def _validate_compatible(weak_schema, strong_schema):
     return
   if weak_schema['type'] != strong_schema['type']:
     raise ValueError(
-        'Incompatible types: %r vs %r' %
-        (weak_schema['type'], strong_schema['type']))
+        f"Incompatible types: {weak_schema['type']!r} vs "
+        f"{strong_schema['type']!r}")
   if weak_schema['type'] == 'array':
     _validate_compatible(weak_schema['items'], strong_schema['items'])
   elif weak_schema['type'] == 'object':
     for required in strong_schema.get('required', []):
       if required not in weak_schema['properties']:
-        raise ValueError('Missing or unkown property %r' % required)
+        raise ValueError(f'Missing or unknown property {required!r}')
     for name, spec in weak_schema.get('properties', {}).items():
       if name in strong_schema['properties']:
         try:
           _validate_compatible(spec, strong_schema['properties'][name])
         except Exception as exn:
-          raise ValueError('Incompatible schema for %r' % name) from exn
+          raise ValueError(f'Incompatible schema for {name!r}') from exn
       elif not strong_schema.get('additionalProperties'):
         raise ValueError(
             f'Prohibited property: {name}; '

sdks/python/apache_beam/yaml/json_utils_test.py

@@ -160,7 +160,8 @@ def test_row_validator_compatibility_error(self):
                 type=schema_pb2.FieldType(atomic_type=schema_pb2.STRING))
         ])
     json_schema = {
-        'type': 'object', 'properties': {
+        'type': 'object',
+        'properties': {
             'f': {
                 'type': 'integer'
             }
@@ -170,9 +171,11 @@ def test_row_validator_compatibility_error(self):
       json_utils.row_validator(beam_schema, json_schema)
 
   def test_json_schema_to_beam_schema_errors(self):
-    with self.assertRaisesRegex(ValueError, "Expected object type, got not_object"):
+    with self.assertRaisesRegex(
+        ValueError, "Expected object type, got not_object"):
       json_utils.json_schema_to_beam_schema({'type': 'not_object'})
-    with self.assertRaisesRegex(ValueError, "Missing properties for"):
+    with self.assertRaisesRegex(
+        ValueError, "Missing properties for"):
       json_utils.json_schema_to_beam_schema({'type': 'object'})