Changeset 391 for python/trunk/Demo/scripts/unbirthday.py

Timestamp:

Mar 19, 2014, 11:31:01 PM (11 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Demo/scripts/unbirthday.py (modified) (3 diffs)

python/trunk/Demo/scripts/unbirthday.py

@@ -11 +11 @@
 
 def main():
-    # Note that the range checks below also check for bad types,
-    # e.g. 3.14 or ().  However syntactically invalid replies
-    # will raise an exception.
     if sys.argv[1:]:
         year = int(sys.argv[1])
     else:
         year = int(raw_input('In which year were you born? '))
-    if 0<=year<100:
+    if 0 <= year < 100:
         print "I'll assume that by", year,
         year = year + 1900
         print 'you mean', year, 'and not the early Christian era'
-    elif not (1850<=year<=2002):
+    elif not (1850 <= year <= time.localtime()[0]):
         print "It's hard to believe you were born in", year
         return
-    #
+
     if sys.argv[2:]:
         month = int(sys.argv[2])
     else:
         month = int(raw_input('And in which month? (1-12) '))
-    if not (1<=month<=12):
+    if not (1 <= month <= 12):
         print 'There is no month numbered', month
         return
-    #
+
     if sys.argv[3:]:
         day = int(sys.argv[3])
@@ -42 +39 @@
     else:
         maxday = calendar.mdays[month]
-    if not (1<=day<=maxday):
+    if not (1 <= day <= maxday):
         print 'There are no', day, 'days in that month!'
         return
-    #
+
     bdaytuple = (year, month, day)
     bdaydate = mkdate(bdaytuple)
     print 'You were born on', format(bdaytuple)
-    #
+
     todaytuple = time.localtime()[:3]
     todaydate = mkdate(todaytuple)
     print 'Today is', format(todaytuple)
-    #
+
     if bdaytuple > todaytuple:
         print 'You are a time traveler.  Go back to the future!'
         return
-    #
+
     if bdaytuple == todaytuple:
         print 'You were born today.  Have a nice life!'
         return
-    #
+
     days = todaydate - bdaydate
     print 'You have lived', days, 'days'
-    #
+
     age = 0
     for y in range(year, todaytuple[0] + 1):
         if bdaytuple < (y, month, day) <= todaytuple:
             age = age + 1
-    #
+
     print 'You are', age, 'years old'
-    #
+
     if todaytuple[1:] == bdaytuple[1:]:
         print 'Congratulations!  Today is your', nth(age), 'birthday'
@@ -89 +86 @@
 
 def mkdate((year, month, day)):
-    # Januari 1st, in 0 A.D. is arbitrarily defined to be day 1,
+    # January 1st, in 0 A.D. is arbitrarily defined to be day 1,
     # even though that day never actually existed and the calendar
     # was different then...
-    days = year*365                 # years, roughly
+    days = year*365                  # years, roughly
     days = days + (year+3)//4        # plus leap years, roughly
     days = days - (year+99)//100     # minus non-leap years every century