Commit 4ce126b8 authored by Moshe Zadka's avatar Moshe Zadka

Updated to use new Python features

Reindented
parent 5403ac9b
...@@ -14,34 +14,34 @@ def main(): ...@@ -14,34 +14,34 @@ def main():
# e.g. 3.14 or (). However syntactically invalid replies # e.g. 3.14 or (). However syntactically invalid replies
# will raise an exception. # will raise an exception.
if sys.argv[1:]: if sys.argv[1:]:
year = eval(sys.argv[1]) year = int(sys.argv[1])
else: else:
year = input('In which year were you born? ') year = int(raw_input('In which year were you born? '))
if year in range(100): if 0<=year<100:
print 'I\'ll assume that by', year, print "I'll assume that by", year,
year = year + 1900 year = year + 1900
print 'you mean', year, 'and not the early Christian era' print 'you mean', year, 'and not the early Christian era'
elif year not in range(1850, 2000): elif not (1850<=year<=2002):
print 'It\'s hard to believe you were born in', year print "It's hard to believe you were born in", year
return return
# #
if sys.argv[2:]: if sys.argv[2:]:
month = eval(sys.argv[2]) month = int(sys.argv[2])
else: else:
month = input('And in which month? (1-12) ') month = int(raw_input('And in which month? (1-12) '))
if month not in range(1, 13): if not (1<=month<=12):
print 'There is no month numbered', month print 'There is no month numbered', month
return return
# #
if sys.argv[3:]: if sys.argv[3:]:
day = eval(sys.argv[3]) day = int(sys.argv[3])
else: else:
day = input('And on what day of that month? (1-31) ') day = int(raw_input('And on what day of that month? (1-31) '))
if month == 2 and calendar.isleap(year): if month == 2 and calendar.isleap(year):
maxday = 29 maxday = 29
else: else:
maxday = calendar.mdays[month] maxday = calendar.mdays[month]
if day not in range(1, maxday+1): if not (1<=day<=maxday):
print 'There are no', day, 'days in that month!' print 'There are no', day, 'days in that month!'
return return
# #
...@@ -49,7 +49,7 @@ def main(): ...@@ -49,7 +49,7 @@ def main():
bdaydate = mkdate(bdaytuple) bdaydate = mkdate(bdaytuple)
print 'You were born on', format(bdaytuple) print 'You were born on', format(bdaytuple)
# #
todaytuple = time.localtime(time.time())[:3] todaytuple = time.localtime()[:3]
todaydate = mkdate(todaytuple) todaydate = mkdate(todaytuple)
print 'Today is', format(todaytuple) print 'Today is', format(todaytuple)
# #
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment