pythonic

lacommunaute/forum_conversation/forms.py

@@ -1,4 +1,3 @@
-from django.core.exceptions import ObjectDoesNotExist
 from django.db.models import F
 from django.forms import CharField, CheckboxSelectMultiple, HiddenInput, ModelMultipleChoiceField
 from machina.apps.forum_conversation.forms import PostForm as AbstractPostForm, TopicForm as AbstractTopicForm
@@ -59,21 +58,15 @@ class TopicForm(CreateUpdatePostMixin, AbstractTopicForm):
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
-        try:
-            if hasattr(self.instance, "topic"):
-                self.fields["tags"].initial = self.instance.topic.tags.all()
-        except ObjectDoesNotExist:
-            pass
+        if self.instance.pk:
+            self.fields["tags"].initial = self.instance.topic.tags.all()
 
     def save(self):
         post = super().save()
-        post.topic.tags.set(self.cleaned_data["tags"])
-        if self.cleaned_data.get("new_tag"):
-            post.topic.tags.add(self.cleaned_data["new_tag"])
 
-        if self.user.is_anonymous:
-            post.username = self.cleaned_data["username"]
+        post.topic.tags.set(self.cleaned_data["tags"])
+        post.topic.tags.add(self.cleaned_data["new_tag"]) if self.cleaned_data.get("new_tag") else None
+        post.username = self.cleaned_data["username"] if self.user.is_anonymous else None
 
         post.save()
-
         return post