Fix depreciation warnings.

Backported from Karaage4:
1b1b9c8

Change-Id: Id9e8b06a9d55e14f1e87214ec52c9fc3c4ddcec1

karaage/machines/views/machines.py

@@ -28,7 +28,7 @@
 from karaage.machines.tables import MachineTable, MachineCategoryTable
 from karaage.machines.tables import AccountTable
 from karaage.machines.models import Machine, MachineCategory
-from karaage.machines.forms import MachineForm
+from karaage.machines.forms import MachineForm, MachineCategoryForm
 from karaage.common.decorators import admin_required, login_required
 import karaage.common as util
 
@@ -132,6 +132,7 @@ def category_create(request):
     from karaage.common.create_update import create_object
     return create_object(
         request, model=MachineCategory,
+        form_class=MachineCategoryForm,
         template_name="karaage/machines/machinecategory_form.html")
 
 
@@ -140,6 +141,7 @@ def category_edit(request, category_id):
     from karaage.common.create_update import update_object
     return update_object(
         request, object_id=category_id, model=MachineCategory,
+        form_class=MachineCategoryForm,
         template_name="karaage/machines/machinecategory_form.html")
 
 

kgsoftware/forms.py

@@ -27,7 +27,7 @@
 from .models import SoftwareVersion, SoftwareLicense
 
 
-class SoftwareForm(forms.Form):
+class SoftwareForm(forms.ModelForm):
     category = forms.ModelChoiceField(queryset=None)
     name = forms.CharField()
     description = forms.CharField(required=False, widget=forms.Textarea())
@@ -41,22 +41,12 @@ def __init__(self, *args, **kwargs):
         super(SoftwareForm, self).__init__(*args, **kwargs)
         self.fields['category'].queryset = SoftwareCategory.objects.all()
 
-    def save(self, software=None):
-        data = self.cleaned_data
-
-        if software is None:
-            software = Software()
-
-        software.category = data['category']
-        software.name = data['name']
-        software.description = data['description']
-        software.homepage = data['homepage']
-        software.tutorial_url = data['tutorial_url']
-        software.academic_only = data['academic_only']
-        software.restricted = data['restricted']
-        software.save()
-
-        return software
+    class Meta:
+        model = Software
+        fields = [
+            'category', 'name', 'description', 'homepage', 'tutorial_url',
+            'academic_only', 'restricted',
+        ]
 
 
 class AddPackageForm(SoftwareForm):
@@ -87,14 +77,13 @@ def clean(self):
 
         return data
 
-    def save(self, software=None):
+    def save(self):
         data = self.cleaned_data
 
-        software = Software()
+        software = super(AddPackageForm, self).save(commit=False)
         name = self.cleaned_data['group_name']
         software.group, _ = Group.objects.get_or_create(name=name)
-
-        software = super(AddPackageForm, self).save(software)
+        software.save()
 
         version = SoftwareVersion(
             software=software,
@@ -112,7 +101,6 @@ def save(self, software=None):
                 date=data['license_date'],
                 text=data['license_text'],
             )
-            software.save()
 
         return software
 
@@ -129,3 +117,12 @@ class SoftwareVersionForm(forms.ModelForm):
     class Meta:
         model = SoftwareVersion
         fields = ['software', 'version', 'machines', 'module', 'last_used']
+
+
+class SoftwareCategoryForm(forms.ModelForm):
+
+    class Meta:
+        model = SoftwareCategory
+        fields = [
+            'name',
+        ]

kgsoftware/views.py

@@ -35,8 +35,8 @@
 
 from .models import SoftwareCategory, Software, SoftwareVersion
 from .models import SoftwareLicense, SoftwareLicenseAgreement
-from .forms import AddPackageForm, LicenseForm
-from .forms import SoftwareVersionForm
+from .forms import SoftwareForm, AddPackageForm, LicenseForm
+from .forms import SoftwareVersionForm, SoftwareCategoryForm
 from .tables import SoftwareFilter, SoftwareTable
 
 
@@ -195,7 +195,6 @@ def software_detail(request, software_id):
 
 @admin_required
 def add_package(request):
-
     if request.method == 'POST':
         form = AddPackageForm(request.POST)
 
@@ -215,7 +214,8 @@ def add_package(request):
 def software_edit(request, software_id):
     from karaage.common.create_update import update_object
     return update_object(
-        request, object_id=software_id, model=Software)
+        request, object_id=software_id, model=Software,
+        form_class=SoftwareForm)
 
 
 @admin_required
@@ -364,14 +364,16 @@ def category_list(request):
 def category_create(request):
     from karaage.common.create_update import create_object
     return create_object(
-        request, model=SoftwareCategory)
+        request, model=SoftwareCategory,
+        form_class=SoftwareCategoryForm)
 
 
 @admin_required
 def category_edit(request, category_id):
     from karaage.common.create_update import update_object
     return update_object(
-        request, object_id=category_id, model=SoftwareCategory)
+        request, object_id=category_id, model=SoftwareCategory,
+        form_class=SoftwareCategoryForm)
 
 
 @admin_required