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

[dataformats][api] Fix key search in dictionary

parent daaa67f2
No related branches found
No related tags found
2 merge requests!2551.4.x,!242Py3 compatibility
......@@ -114,14 +114,14 @@ class RetrieveUpdateDestroyDataFormatsView(RetrieveUpdateDestroyContributionView
if not data:
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']
......@@ -132,7 +132,7 @@ class RetrieveUpdateDestroyDataFormatsView(RetrieveUpdateDestroyContributionView
else:
description = None
if data.has_key('declaration'):
if 'declaration' in data:
if isinstance(data['declaration'], dict):
json_declaration = data['declaration']
declaration = json.dumps(json_declaration, indent=4)
......@@ -145,7 +145,7 @@ class RetrieveUpdateDestroyDataFormatsView(RetrieveUpdateDestroyContributionView
else:
raise serializers.ValidationError({'declaration': 'Invalid declaration data'})
if json_declaration.has_key('#description'):
if '#description' in json_declaration:
if short_description is not None:
raise serializers.ValidationError({'short_description': 'A short description is already provided in the data format declaration'})
......@@ -162,7 +162,7 @@ class RetrieveUpdateDestroyDataFormatsView(RetrieveUpdateDestroyContributionView
# 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):
......
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