Convert codebase for python3 usage

1 files changed, 4 insertions, 6 deletions

diff --git a/core/forms.py b/core/forms.py
index 8265178..b8d2e07 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -1,5 +1,5 @@
 from django.forms import ModelForm
-from models import Cave, Person, PersonExpedition, LogbookEntry, QM, Expedition, Entrance, CaveAndEntrance
+from .models import Cave, Person, PersonExpedition, LogbookEntry, QM, Expedition, Entrance, CaveAndEntrance
 import django.forms as forms
 from django.forms.models import modelformset_factory
 from django.contrib.admin.widgets import AdminDateWidget
@@ -114,8 +114,7 @@ def getTripForm(expedition):
     class TripForm(forms.Form):
         date = forms.DateField()
         title = forms.CharField(max_length=200)
-        caves = [cave.reference() for cave in Cave.objects.all()]
-        caves.sort()
+        caves = sorted([cave.reference() for cave in Cave.objects.all()])
         caves = ["-----"] + caves
         cave = forms.ChoiceField([(c, c) for c in caves], required=False)
         location = forms.CharField(max_length=200, required=False) 
@@ -123,7 +122,7 @@ def getTripForm(expedition):
         html = forms.CharField(widget=TinyMCE(attrs={'cols': 80, 'rows': 30})) 
 
         def clean(self):
-            print(dir(self))
+            print((dir(self)))
             if self.cleaned_data.get("caveOrLocation") == "cave" and not self.cleaned_data.get("cave"):
                 self._errors["cave"] = self.error_class(["This field is required"]) 
             if self.cleaned_data.get("caveOrLocation") == "location" and not self.cleaned_data.get("location"):
@@ -131,8 +130,7 @@ def getTripForm(expedition):
             return self.cleaned_data
   
     class PersonTripForm(forms.Form):
-        names = [get_name(pe) for pe in PersonExpedition.objects.filter(expedition = expedition)]
-        names.sort()
+        names = sorted([get_name(pe) for pe in PersonExpedition.objects.filter(expedition = expedition)])
         names = ["-----"] + names
         name = forms.ChoiceField([(n, n) for n in names])
         TU = forms.FloatField(required=False)