Skip to content
Snippets Groups Projects
Commit fe909090 authored by Samuel GAIST's avatar Samuel GAIST
Browse files

[plotters][api] Fix key search in dictionaries

parent 8730e9c6
No related branches found
No related tags found
2 merge requests!2551.4.x,!242Py3 compatibility
...@@ -281,14 +281,14 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi ...@@ -281,14 +281,14 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi
raise serializers.ValidationError({'data': 'Empty'}) 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)): if not(isinstance(data['short_description'], six.string_types)):
raise serializers.ValidationError({'short_description', 'Invalid short_description data'}) raise serializers.ValidationError({'short_description', 'Invalid short_description data'})
short_description = data['short_description'] short_description = data['short_description']
else: else:
short_description = None short_description = None
if data.has_key('description'): if 'description' in data:
if not(isinstance(data['description'], six.string_types)): if not(isinstance(data['description'], six.string_types)):
raise serializers.ValidationError({'description': 'Invalid description data'}) raise serializers.ValidationError({'description': 'Invalid description data'})
description = data['description'] description = data['description']
...@@ -299,13 +299,13 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi ...@@ -299,13 +299,13 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi
else: else:
description = None description = None
if data.has_key('strict'): if 'strict' in data:
strict = data['strict'] strict = data['strict']
else: else:
strict = True strict = True
plotter = None plotter = None
if data.has_key('plotter'): if 'plotter' in data:
try: try:
if isinstance(data['plotter'], int): if isinstance(data['plotter'], int):
plotter = Plotter.objects.get(id=data['plotter']) plotter = Plotter.objects.get(id=data['plotter'])
...@@ -318,11 +318,11 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi ...@@ -318,11 +318,11 @@ class RetrieveUpdateDestroyPlotterParametersView(RetrieveUpdateDestroyContributi
raise serializers.ValidationError({'short_description': 'Short description too long'}) raise serializers.ValidationError({'short_description': 'Short description too long'})
customdata = None customdata = None
if data.has_key('customdata'): if 'customdata' in data:
customdata = json.dumps(data['customdata']) customdata = json.dumps(data['customdata'])
# Process the query string # Process the query string
if request.GET.has_key('fields'): if 'fields' in request.GET:
fields_to_return = request.GET['fields'].split(',') fields_to_return = request.GET['fields'].split(',')
else: else:
# Available fields (not returned by default): # Available fields (not returned by default):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment