From e48c6b2d0422680ad9f08e5ae3da74e0f20fb639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laura=20Kl=C3=BCnder?= Date: Sat, 24 Dec 2016 23:22:00 +0100 Subject: [PATCH] fix packageio color loading --- src/c3nav/mapdata/models/locations.py | 2 +- src/c3nav/mapdata/packageio/read.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/c3nav/mapdata/models/locations.py b/src/c3nav/mapdata/models/locations.py index 21c76e25..b4d8c591 100644 --- a/src/c3nav/mapdata/models/locations.py +++ b/src/c3nav/mapdata/models/locations.py @@ -69,7 +69,7 @@ class LocationModelMixin(Location): raise ValueError('can_describe has to be boolean!') kwargs['can_describe'] = can_describe - if 'color' not in data: + if 'color' in data: color = data['color'] if not isinstance(color, str): raise ValueError('color has to be str!') diff --git a/src/c3nav/mapdata/packageio/read.py b/src/c3nav/mapdata/packageio/read.py index 0d93df56..5205b12b 100644 --- a/src/c3nav/mapdata/packageio/read.py +++ b/src/c3nav/mapdata/packageio/read.py @@ -142,6 +142,7 @@ class ReaderItem: try: add_data = self.model.fromfile(self.json_data, self.path_in_package) except Exception as e: + raise raise CommandError('Could not load data: %s' % e) self.data.update(add_data)