Moved event specific code from ChainedForm to EventCreateForm via

ModelMixin.

dav_events/forms/generic.py

@@ -56,15 +56,6 @@ class ChainedForm(forms.Form):
         self._session_data.update(self.cleaned_data)
         self._save_session_data()
 
-    def _get_model(self):
-        if not hasattr(self, '_model'):
-            raise ImproperlyConfigured('{cls} is missing a Model.'
-                                       ' Define {cls}._model'.format(cls=self.__class__.__name__))
-        return self._model
-
-    def _get_object(self, model_kwargs):
-        return self._get_model()(**model_kwargs)
-
     @property
     def form_name(self):
         return self.__class__.__name__
@@ -111,27 +102,31 @@ class ChainedForm(forms.Form):
                 value = app_config.settings.form_initials[form_name][field_name].get_value(self._session_data)
         return value
 
-    def save(self):
-        object_kwargs = dict()
-        data = self._session_data.copy()
-        if 'deadline' in data:
-            buf = data['deadline']
-            if isinstance(buf, basestring):
-                deadline_choice = buf.lower()
-                deadline_field = 'deadline_{}'.format(deadline_choice)
-                if deadline_field in data:
-                    data['deadline'] = data[deadline_field]
-
-        model = self._get_model()
-        for field in data:
-            if hasattr(model, field):
-                object_kwargs[field] = data[field]
-
-        return self._get_object(object_kwargs)
-
     def flush_session_data(self):
         if self._request is not None and hasattr(self._request, 'session'):
             session_var_name = '{}_chained_form_session_data'.format(self._request.resolver_match.url_name)
             if session_var_name in self._request.session:
                 del self._request.session[session_var_name]
             self._session_data = dict()
+
+
+class ModelMixin(object):
+    _model = None
+
+    def _get_model(self):
+        if not self._model:
+            raise ImproperlyConfigured('{cls} is missing a Model.'
+                                       ' Define {cls}._model'.format(cls=self.__class__.__name__))
+        return self._model
+
+    def _get_instance_kwargs(self):
+        return self.cleaned_data
+
+    def get_instance(self):
+        model = self._get_model()
+        kwargs1 = self._get_instance_kwargs()
+        kwargs2 = dict()
+        for attr in kwargs1:
+            if hasattr(model, attr):
+                kwargs2[attr] = kwargs1[attr]
+        return model(**kwargs2)