summaryrefslogtreecommitdiff
path: root/morphlib/yamlparse.py
Commit message (Collapse)AuthorAgeFilesLines
* yaml: use Safe Loaders and DumpersRichard Maw2013-02-111-4/+4
| | | | | This is equivalent to using yaml.safe_load(), but lets us customise how yaml is parsed.
* Merge branch 'liw/soft-pyyaml-dep'Sam Thursfield2013-01-291-85/+99
|\ | | | | | | Merge commit fixes up a copyright year and removes EOL whitespace
| * Make yaml be an optional dependencyLars Wirzenius2013-01-291-85/+100
|/ | | | | This can go away when we have made a release with yaml in it, and its staging filler.
* Parse as YAML if not valid JSONRichard Maw2013-01-221-0/+119
Tests are currently broken, one because invalid JSON can be valid YAML, and coverage is incomplete.