modocache added a comment. I double-checked this diff worked when run on a directory containing a single YAML file, using Python 2, and it appeared to work. Let me know if it breaks anything for any of your workflows! https://reviews.llvm.org/D36624