diff options
Diffstat (limited to 'core/views_logbooks.py')
| -rw-r--r-- | core/views_logbooks.py | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/core/views_logbooks.py b/core/views_logbooks.py index 65453fa..b29b72e 100644 --- a/core/views_logbooks.py +++ b/core/views_logbooks.py @@ -62,8 +62,7 @@ def expedition(request, expeditionname): expeditions = Expedition.objects.all() personexpeditiondays = [ ] dateditems = list(this_expedition.logbookentry_set.all()) + list(this_expedition.survexblock_set.all()) - dates = list(set([item.date for item in dateditems])) - dates.sort() + dates = sorted(set([item.date for item in dateditems])) for personexpedition in this_expedition.personexpedition_set.all(): prow = [ ] for date in dates: @@ -115,8 +114,7 @@ def GetPersonChronology(personexpedition): a.setdefault("personroles", [ ]).append(personrole.survexblock) # build up the tables - rdates = res.keys() - rdates.sort() + rdates = sorted(list(res.keys())) res2 = [ ] @@ -206,8 +204,8 @@ def pathsreport(request): ncodes = len(pathsdict) - bycodeslist = sorted(pathsdict.iteritems()) - bypathslist = sorted(pathsdict.iteritems(), key=lambda x: x[1]) + bycodeslist = sorted(pathsdict.items()) + bypathslist = sorted(iter(pathsdict.items()), key=lambda x: x[1]) return render(request, 'pathsreport.html', { "pathsdict":pathsdict, @@ -264,7 +262,7 @@ def newLogbookEntry(request, expeditionyear, pdate = None, pslug = None): 'expeditionyear': expeditionyear}) f.write(template.render(context)) f.close() - print(logbookparsers.parseAutoLogBookEntry(filename)) + print((logbookparsers.parseAutoLogBookEntry(filename))) return HttpResponseRedirect(reverse('expedition', args=[expedition.year])) # Redirect after POST else: if pslug and pdate: |