Skip to content

Commit 081e7b2

Browse files
committed
Working on twelve-days challenge
1 parent 732b9a3 commit 081e7b2

File tree

2 files changed

+31
-9
lines changed

2 files changed

+31
-9
lines changed

twelve-days/twelve_days.py

+31-9
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,23 @@
11
import re
22

33
def recite(start_verse, end_verse):
4+
5+
6+
Dictionary2D = {
7+
12:["twelfth", "twelve"],
8+
11:["eleventh", "eleven"],
9+
10:["tenth", "ten"],
10+
9:["ninth", "nine"],
11+
8:["eigth", "eigth"],
12+
7:["seventh", "seven"],
13+
6:["sixth", "six"],
14+
5:["fifth", "five"],
15+
4:["fourth", "four"],
16+
3:["third", "three","French Hens, "],
17+
2:["second", "two","Turtle Doves, "],
18+
1:["first", "and a", "Partridge in a Pear Tree."]
19+
}
20+
421
# "On the twelfth day of Christmas my true love gave to me: "
522
# "twelve Drummers Drumming, "
623
# "eleven Pipers Piping, "
@@ -15,7 +32,6 @@ def recite(start_verse, end_verse):
1532
# "two Turtle Doves, "
1633
# "and a Partridge in a Pear Tree."
1734
song = {}
18-
song[0] = 'On the variable day of Christmas my true love gave to me: '
1935
song[1] = 'Partridge in a Pear Tree'
2036
song[2] = 'Turtle Doves'
2137
song[3] = 'French Hens'
@@ -30,7 +46,6 @@ def recite(start_verse, end_verse):
3046
song[12] = 'Drummers Drumming'
3147

3248
numbers = {}
33-
numbers[0] = ''
3449
numbers[1] = 'a'
3550
numbers[2] = 'two'
3651
numbers[3] = 'three'
@@ -45,7 +60,6 @@ def recite(start_verse, end_verse):
4560
numbers[12] = 'twelve'
4661

4762
nth = {}
48-
nth[0] = ''
4963
nth[1] = 'first'
5064
nth[2] = 'second'
5165
nth[3] = 'third'
@@ -59,11 +73,19 @@ def recite(start_verse, end_verse):
5973
nth[11] = 'eleventh'
6074
nth[12] = 'twelfth'
6175

62-
for k, v in song.items():
63-
if k == end_verse:
64-
break
65-
elif k == 0:
66-
v = re.sub("variable", nth[end_verse], v)
67-
print(numbers[k] +" "+ v)
76+
77+
print("On the " + nth[end_verse] + " day of Christmas my true love gave to me: ")
78+
79+
for k, v in song.items()[::-1]:
80+
if song[k] > 1
81+
print(numbers[k] +" "+ v)
82+
83+
84+
if end_verse > 1:
85+
end_line = "and"
86+
print(end_line + " " + numbers[1] + " " + "Partridge in a Pear Tree")
87+
else:
88+
print(numbers[1] + " " + "Partridge in a Pear Tree")
89+
6890
print("######")
6991
pass

twelve-days/twelve_days.pyc

1.75 KB
Binary file not shown.

0 commit comments

Comments
 (0)