From a7626390387e153c3ff75edc353e3d8a8a73374a Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Fri, 28 Dec 2018 13:09:17 -0800 Subject: [PATCH] switch from pyyaml to ruamel.yaml --- pre_commit_hooks/check_yaml.py | 12 +++++------- setup.py | 2 +- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pre_commit_hooks/check_yaml.py b/pre_commit_hooks/check_yaml.py index 9fbbd88d..208737f1 100644 --- a/pre_commit_hooks/check_yaml.py +++ b/pre_commit_hooks/check_yaml.py @@ -4,12 +4,9 @@ import collections import sys -import yaml +import ruamel.yaml -try: - from yaml.cyaml import CSafeLoader as Loader -except ImportError: # pragma: no cover (no libyaml-dev / pypy) - Loader = yaml.SafeLoader +yaml = ruamel.yaml.YAML(typ='safe') def _exhaust(gen): @@ -57,8 +54,9 @@ def check_yaml(argv=None): retval = 0 for filename in args.filenames: try: - load_fn(open(filename), Loader=Loader) - except yaml.YAMLError as exc: + with open(filename) as f: + load_fn(f) + except ruamel.yaml.YAMLError as exc: print(exc) retval = 1 return retval diff --git a/setup.py b/setup.py index 99d2430a..84892a7c 100644 --- a/setup.py +++ b/setup.py @@ -25,7 +25,7 @@ packages=find_packages(exclude=('tests*', 'testing*')), install_requires=[ 'flake8', - 'pyyaml', + 'ruamel.yaml>=0.15', 'six', ], entry_points={