From 08f4287c55150f02d829670f8a977d117b5e3233 Mon Sep 17 00:00:00 2001 From: Stefan Huber Date: Thu, 4 Jun 2020 09:47:54 +0200 Subject: [PATCH] bib2html.py: Turn into python3 --- bib2html.py | 40 ++++++++++++++++++---------------------- 1 file changed, 18 insertions(+), 22 deletions(-) diff --git a/bib2html.py b/bib2html.py index 111d108..3ad3a93 100755 --- a/bib2html.py +++ b/bib2html.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python3 """Creates a webpage with all entries of a .bib file""" __version__ = "1.0" @@ -47,7 +47,7 @@ def format_field(bibentry, field, pre='', post=''): return "" def format_author(a): - return ' '.join(' '.join(p) for p in (a.first(), a.middle(), a.prelast(), a.last(), a.lineage()) if p) + return ' '.join(' '.join(p) for p in (a.first_names, a.middle_names, a.prelast_names, a.last_names, a.lineage_names) if p) def format_authors(entry): return ", ".join([format_author(a) for a in entry.persons['author']]) @@ -127,24 +127,19 @@ def format_entry(entry): return "
\n".join(lines) -def entryCompareDate(p1, p2): - k1, e1 = p1 - k2, e2 = p2 +def entryDateSortKey(p): + k, e = p - - def toStr(e): - month2num = { 'jan' : '01', 'feb' : '02', 'mar' : '03', \ - 'apr' : '04', 'may' : '05', 'jun' : '06', \ - 'jul' : '07', 'aug' : '08', 'sep' : '09', \ - 'oct' : '10', 'nov' : '11', 'dec' : '12'} - month = e.fields['month'].lower()[0:3] - if month in month2num: - month = month2num[month] - else: - month = "" - return e.fields['year'] + "-" + month - - return cmp(toStr(e1), toStr(e2)) + month2num = { 'jan' : '01', 'feb' : '02', 'mar' : '03', \ + 'apr' : '04', 'may' : '05', 'jun' : '06', \ + 'jul' : '07', 'aug' : '08', 'sep' : '09', \ + 'oct' : '10', 'nov' : '11', 'dec' : '12'} + month = e.fields['month'].lower()[0:3] + if month in month2num: + month = month2num[month] + else: + month = "" + return e.fields['year'] + "-" + month def usage(): @@ -200,8 +195,8 @@ if __name__ == "__main__": print("

" + year + "

") - iteritems = list(entries.iteritems()) - iteritems.sort(cmp=entryCompareDate, reverse=True) + iteritems = list(entries.items()) + iteritems.sort(key=entryDateSortKey, reverse=True) for key, entry in iteritems: if entry.fields['year'] != year: @@ -210,7 +205,8 @@ if __name__ == "__main__": print("
") print("[" + key + "]
") - print(format_entry(entry).encode('utf8')) + e = format_entry(entry) + print(e) print("
\n") -- 2.30.2