From e785acb252edf74791d7eb356e2b68a05a338d33 Mon Sep 17 00:00:00 2001 From: Sam Thursfield Date: Mon, 6 Oct 2014 15:15:08 +0100 Subject: fixup! import: Raise error on invalid .lorry file --- import/main.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/import/main.py b/import/main.py index cf5836c1..c174dc62 100644 --- a/import/main.py +++ b/import/main.py @@ -20,6 +20,7 @@ import cliapp import morphlib import networkx +import six import contextlib import copy @@ -153,9 +154,9 @@ class LorrySet(object): raise cliapp.AppException( 'Invalid lorry %s: %s' % (filename, lorry_entry)) - if not isinstance(info['url'], str): + if not isinstance(info.get('url'), six.string_types): raise cliapp.AppException( - 'Invalid URL in lorry %s: %s' % (filename, info['url'])) + 'Invalid URL in lorry %s: %s' % (filename, info.get('url'))) if project_name in self.data: stored_lorry = self.get_lorry(project_name) -- cgit v1.2.1