Merge 9f6eb9cd1b into f1dff44d3a

pre_commit_hooks/check_yaml.py

@@ -63,7 +63,13 @@ def main(argv: Sequence[str] | None = None) -> int:
             with open(filename, encoding='UTF-8') as f:
                 load_fn(f)
         except ruamel.yaml.YAMLError as exc:
-            print(exc)
+            print(f'{filename}: Failed to yaml parse ({exc})')
+            retval = 1
+        except UnicodeDecodeError as exc:
+            print(
+                f'{filename}: Failed to read file due to encoding error '
+                f'({exc})',
+            )
             retval = 1
     return retval
 

testing/resources/bad_encoding_yaml.yaml

@@ -0,0 +1,3 @@
+variables:
+  - name: CopyRights
+    value: "Copyright © $(date:YYYY)"

tests/check_yaml_test.py

@@ -9,6 +9,7 @@ from testing.util import get_resource_path
 @pytest.mark.parametrize(
     ('filename', 'expected_retval'), (
         ('bad_yaml.notyaml', 1),
+        ('bad_encoding_yaml.yaml', 1),
         ('ok_yaml.yaml', 0),
     ),
 )