expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 08:41:51 +00:00
Code Issues 19 Projects 3 Activity

2to3 sort comparison key change

Browse Source
This commit is contained in:
Philip Sargent 2020-05-25 01:46:52 +01:00
parent 50d753a87b
commit 0a864c7f87
1 changed files with 8 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/views_caves.py
View File

@ -37,19 +37,11 @@ def padnumber(x):
def numericalcmp(x, y): def numericalcmp(x, y):
return cmp(padnumber(x), padnumber(y)) return cmp(padnumber(x), padnumber(y))
def caveKey(x):
"""python3 function for sort.
def caveCmp(x, y): Note that cave kataster numbers are not generally integers
if x.kataster_number: """
if y.kataster_number: return x.kataster_number
return numericalcmp(x.kataster_number, y.kataster_number) # Note that cave kataster numbers are not generally integers.
else:
return -1
else:
if y.kataster_number:
return 1
else:
return numericalcmp(x.unofficial_number, y.unofficial_number)
def caveindex(request): def caveindex(request):
caves = Cave.objects.all() caves = Cave.objects.all()
@ -57,8 +49,9 @@ def caveindex(request):
notablecaves = [Cave.objects.get(kataster_number=kataster_number) for kataster_number in notablecavehrefs ] notablecaves = [Cave.objects.get(kataster_number=kataster_number) for kataster_number in notablecavehrefs ]
caves1623 = list(Cave.objects.filter(area__short_name = "1623")) caves1623 = list(Cave.objects.filter(area__short_name = "1623"))
caves1626 = list(Cave.objects.filter(area__short_name = "1626")) caves1626 = list(Cave.objects.filter(area__short_name = "1626"))
caves1623.sort(caveCmp) #python2 to python3 issue https://realpython.com/python-sort/
caves1626.sort(caveCmp) caves1623.sort(key=caveKey)
caves1626.sort(key=caveKey)
return render(request,'caveindex.html', {'caves1623': caves1623, 'caves1626': caves1626, 'notablecaves':notablecaves, 'cavepage': True}) return render(request,'caveindex.html', {'caves1623': caves1623, 'caves1626': caves1626, 'notablecaves':notablecaves, 'cavepage': True})
def millenialcaves(request): def millenialcaves(request):