diff options
| author | Philip Sargent <philip@Muscogee.localdomain> | 2020-05-24 01:57:06 +0100 |
|---|---|---|
| committer | Wookey <wookey@wookware.org> | 2020-05-24 20:56:27 +0100 |
| commit | 50d753a87b5f6bc4fe31e222a37796cf903133f7 (patch) | |
| tree | 885b01fa921893684b602c20392c1ef995e13482 /parsers/QMs.py | |
| parent | 35f85c55f14e707e37d822041e25bca2913f48c4 (diff) | |
| download | troggle-50d753a87b5f6bc4fe31e222a37796cf903133f7.tar.gz troggle-50d753a87b5f6bc4fe31e222a37796cf903133f7.tar.bz2 troggle-50d753a87b5f6bc4fe31e222a37796cf903133f7.zip | |
Convert codebase for python3 usage
Diffstat (limited to 'parsers/QMs.py')
| -rw-r--r-- | parsers/QMs.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/parsers/QMs.py b/parsers/QMs.py index 47e6bc7..a5ecd2f 100644 --- a/parsers/QMs.py +++ b/parsers/QMs.py @@ -38,7 +38,7 @@ def parseCaveQMs(cave,inputFile): dialect=csv.Sniffer().sniff(qmCSVContents.read()) qmCSVContents.seek(0,0) qmReader = csv.reader(qmCSVContents,dialect=dialect) - qmReader.next() # Skip header row + next(qmReader) # Skip header row for line in qmReader: try: year=int(line[0][1:5]) @@ -48,7 +48,7 @@ def parseCaveQMs(cave,inputFile): elif cave=='hauch': placeholder, hadToCreate = LogbookEntry.objects.get_or_create(date__year=year, title="placeholder for QMs in 234", text="QMs temporarily attached to this should be re-attached to their actual trips", defaults={"date": date(year, 1, 1),"cave":hauchHl}) if hadToCreate: - print(cave + " placeholder logbook entry for " + str(year) + " added to database") + print((cave + " placeholder logbook entry for " + str(year) + " added to database")) QMnum=re.match(r".*?-\d*?-X?(?P<numb>\d*)",line[0]).group("numb") newQM = QM() newQM.found_by=placeholder @@ -71,9 +71,9 @@ def parseCaveQMs(cave,inputFile): if preexistingQM.new_since_parsing==False: #if the pre-existing QM has not been modified, overwrite it preexistingQM.delete() newQM.save() - print("overwriting " + str(preexistingQM) +"\r") + print(("overwriting " + str(preexistingQM) +"\r")) else: # otherwise, print that it was ignored - print("preserving " + str(preexistingQM) + ", which was edited in admin \r") + print(("preserving " + str(preexistingQM) + ", which was edited in admin \r")) except QM.DoesNotExist: #if there is no pre-existing QM, save the new one newQM.save() @@ -82,7 +82,7 @@ def parseCaveQMs(cave,inputFile): except KeyError: #check on this one continue except IndexError: - print("Index error in " + str(line)) + print(("Index error in " + str(line))) continue def parse_KH_QMs(kh, inputFile): |