diff --git a/beat/web/plotters/api.py b/beat/web/plotters/api.py index ba9cbd2f076f0adf528aabf18eb66b8f382419e6..2dd32f4c16b2ccdf548901dc84f9f00b6b27e90e 100644 --- a/beat/web/plotters/api.py +++ b/beat/web/plotters/api.py @@ -281,14 +281,14 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi raise serializers.ValidationError({'data': 'Empty'}) - if data.has_key('short_description'): + if 'short_description' in data: if not(isinstance(data['short_description'], six.string_types)): raise serializers.ValidationError({'short_description', 'Invalid short_description data'}) short_description = data['short_description'] else: short_description = None - if data.has_key('description'): + if 'description' in data: if not(isinstance(data['description'], six.string_types)): raise serializers.ValidationError({'description': 'Invalid description data'}) description = data['description'] @@ -299,13 +299,13 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi else: description = None - if data.has_key('strict'): + if 'strict' in data: strict = data['strict'] else: strict = True plotter = None - if data.has_key('plotter'): + if 'plotter' in data: try: if isinstance(data['plotter'], int): plotter = Plotter.objects.get(id=data['plotter']) @@ -318,11 +318,11 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi raise serializers.ValidationError({'short_description': 'Short description too long'}) customdata = None - if data.has_key('customdata'): + if 'customdata' in data: customdata = json.dumps(data['customdata']) # Process the query string - if request.GET.has_key('fields'): + if 'fields' in request.GET: fields_to_return = request.GET['fields'].split(',') else: # Available fields (not returned by default):