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

[code][api] Fix key search in dictionaries

parent e2fbfe2c
No related branches found
No related tags found
2 merge requests!2551.4.x,!242Py3 compatibility
......@@ -110,14 +110,14 @@ class RetrieveUpdateDestroyCodeView(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 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']
......@@ -128,7 +128,7 @@ class RetrieveUpdateDestroyCodeView(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)
......@@ -141,7 +141,7 @@ class RetrieveUpdateDestroyCodeView(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 declaration'})
......@@ -156,7 +156,7 @@ class RetrieveUpdateDestroyCodeView(RetrieveUpdateDestroyContributionView):
if (short_description is not None) and (len(short_description) > self.model._meta.get_field('short_description').max_length):
raise ValidationError({'short_description': 'Short description too long'})
if data.has_key('code'):
if 'code' in data:
if not(isinstance(data['code'], six.string_types)):
raise ValidationError({'code': 'Invalid code data'})
code = data['code']
......@@ -241,7 +241,7 @@ class RetrieveUpdateDestroyCodeView(RetrieveUpdateDestroyContributionView):
# Available fields (not returned by default):
# - html_description
if request.GET.has_key('fields'):
if 'fields' in request.GET:
fields_to_return = request.GET['fields'].split(',')
else:
return Response(status=204)
......
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