diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2013-01-18 16:18:20 +0000 |
|---|---|---|
| committer | Javier Jardón <javier.jardon@codethink.co.uk> | 2013-01-22 18:34:22 +0000 |
| commit | 7ef9cb8922bd933ae8ee58cb24a2b38844a0e629 (patch) | |
| tree | 74f71465c0002d98b8c741f4d728dc3cf6f620ad /morphlib/__init__.py | |
| parent | a8d30277932099dcae31f99d3fbd531f74eb0249 (diff) | |
| download | morph-7ef9cb8922bd933ae8ee58cb24a2b38844a0e629.tar.gz | |
Parse as YAML if not valid JSON
Tests are currently broken, one because invalid JSON
can be valid YAML, and coverage is incomplete.
Diffstat (limited to 'morphlib/__init__.py')
| -rw-r--r-- | morphlib/__init__.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/morphlib/__init__.py b/morphlib/__init__.py index 213241d8..5730d41e 100644 --- a/morphlib/__init__.py +++ b/morphlib/__init__.py @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2012 Codethink Limited +# Copyright (C) 2011-2013 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -56,5 +56,6 @@ import stagingarea import stopwatch import tempdir import util +import yamlparse import app # this needs to be last |