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

[plotters][serializers] Fix key search in dictionaries

parent 9d26484d
No related branches found
No related tags found
2 merge requests!2551.4.x,!242Py3 compatibility
...@@ -119,7 +119,7 @@ class PlotterParameterCreationSerializer(ContributionCreationSerializer): ...@@ -119,7 +119,7 @@ class PlotterParameterCreationSerializer(ContributionCreationSerializer):
def create(self, validated_data): def create(self, validated_data):
plotterparameter = None plotterparameter = None
if not validated_data.has_key("name"): if "name" not in validated_data:
raise serializers.ValidationError('No name provided') raise serializers.ValidationError('No name provided')
try: try:
...@@ -130,7 +130,7 @@ class PlotterParameterCreationSerializer(ContributionCreationSerializer): ...@@ -130,7 +130,7 @@ class PlotterParameterCreationSerializer(ContributionCreationSerializer):
if plotterparameter is not None: if plotterparameter is not None:
raise serializers.ValidationError('A plotterparameter with this name already exists') raise serializers.ValidationError('A plotterparameter with this name already exists')
if not self.data.has_key("plotter"): if "plotter" not in self.data:
raise serializers.ValidationError('No plotter provided') raise serializers.ValidationError('No plotter provided')
plotter = None plotter = None
...@@ -142,11 +142,11 @@ class PlotterParameterCreationSerializer(ContributionCreationSerializer): ...@@ -142,11 +142,11 @@ class PlotterParameterCreationSerializer(ContributionCreationSerializer):
if plotter is None: if plotter is None:
raise serializers.ValidationError('Required plotter does not exist') raise serializers.ValidationError('Required plotter does not exist')
if not validated_data.has_key("data"): if "data" not in validated_data:
validated_data['data'] = {} validated_data['data'] = {}
#Only create new version for latest version #Only create new version for latest version
if validated_data.has_key("previous_version"): if "previous_version" in validated_data:
if validated_data['previous_version'].version < validated_data['version'] - 1: if validated_data['previous_version'].version < validated_data['version'] - 1:
raise serializers.ValidationError('A new version for this plotterparameter version already exist') raise serializers.ValidationError('A new version for this plotterparameter version already exist')
...@@ -155,7 +155,7 @@ class PlotterParameterCreationSerializer(ContributionCreationSerializer): ...@@ -155,7 +155,7 @@ class PlotterParameterCreationSerializer(ContributionCreationSerializer):
validated_data['description'] = validated_data['previous_version'].description validated_data['description'] = validated_data['previous_version'].description
#Create fork #Create fork
if validated_data.has_key("fork_of"): if "fork_of" in validated_data:
#add description/short_description to new version #add description/short_description to new version
validated_data['short_description'] = validated_data['fork_of'].short_description validated_data['short_description'] = validated_data['fork_of'].short_description
validated_data['description'] = validated_data['fork_of'].description validated_data['description'] = validated_data['fork_of'].description
......
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