From 44b2030eb94aea3bae9fc2d6aac5636c52253d18 Mon Sep 17 00:00:00 2001 From: Enero <43368587+232enero@users.noreply.github.com> Date: Tue, 13 Oct 2020 10:08:07 +0200 Subject: [PATCH] Update views.py --- nabweatherd/views.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nabweatherd/views.py b/nabweatherd/views.py index cb150d05..72a7ff05 100644 --- a/nabweatherd/views.py +++ b/nabweatherd/views.py @@ -38,15 +38,10 @@ def get(self, request, *args, **kwargs): list_places = client.search_places(search_location) for one_place in list_places: # correct bad json returned my MeteoFrance -<<<<<<< HEAD - one_place.raw_data['name'] = one_place.raw_data['name'].replace("'", " ") - one_place.raw_data['admin'] = one_place.raw_data['admin'].replace("'", " ") -======= if ('name' in one_place.raw_data): one_place.raw_data['name'] = one_place.raw_data['name'].replace("'", " ") if ('admin' in one_place.raw_data): one_place.raw_data['admin'] = one_place.raw_data['admin'].replace("'", " ") ->>>>>>> releng json_item['value'] = str(one_place.raw_data) json_item['text'] = one_place.__str__() json_places.append(json_item)