From 7ef9cb8922bd933ae8ee58cb24a2b38844a0e629 Mon Sep 17 00:00:00 2001 From: Richard Maw Date: Fri, 18 Jan 2013 16:18:20 +0000 Subject: Parse as YAML if not valid JSON Tests are currently broken, one because invalid JSON can be valid YAML, and coverage is incomplete. --- morphlib/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'morphlib/__init__.py') 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 -- cgit v1.2.1