From 3de62878d6668d4caff31894e9b6dd627380a43c Mon Sep 17 00:00:00 2001 From: naath Date: Sun, 30 Mar 2014 13:38:25 +0100 Subject: [PATCH] fixing ordinal number for 11,12,13 --- familyTree/askQuestion.py | 16 ++++++++-------- familyTree/printPerson.py | 2 ++ 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/familyTree/askQuestion.py b/familyTree/askQuestion.py index 7bb39cd..7018503 100755 --- a/familyTree/askQuestion.py +++ b/familyTree/askQuestion.py @@ -81,15 +81,15 @@ def print_tagged_name(relationship,row,newLine): def ordinal_numbers(number): - out = str(number) - if number==1: - out = out +'st' - elif number==2: - out = out +'nd' - elif number==3: - out = out +'rd' + number = int(number) + if number % 10==1 and number/10 % 10 !=1: + out = str(number) +'st' + elif number % 10==2 and number/10 % 10 !=1: + out = str(number) +'nd' + elif number % 10==3 and number/10 % 10 !=1: + out = str(number) +'rd' else: - out = out +'th' + out = str(number) +'th' return out def list_territories(newLine): diff --git a/familyTree/printPerson.py b/familyTree/printPerson.py index f5f1228..d2d2290 100755 --- a/familyTree/printPerson.py +++ b/familyTree/printPerson.py @@ -15,4 +15,6 @@ else: print o + + askQuestion.close(conn) -- 2.30.2