diff --git a/beat/web/code/api.py b/beat/web/code/api.py index 61c4f505ac06c6a28d9969dca0fe309eefa677f0..696cd3aee67e3d01dbbbfa1b39f7acacafe083da 100755 --- a/beat/web/code/api.py +++ b/beat/web/code/api.py @@ -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)