Update views.py

nabaztag2018 · Oct 13, 2020 · 44b2030 · 44b2030
1 parent ea6e79d
commit 44b2030
Showing 1 changed file with 0 additions and 5 deletions.
diff --git 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)