mirror of
https://github.com/python/cpython.git
synced 2025-08-04 00:48:58 +00:00
* More changes due to stricter argument passing rules
* Fixed calendar.py, mimetools.py, whrandom.py to cope with time.time() returning a floating point number. (And fix old bug in calendar) * Add recursion level to mainloop.mainloop(), to make it reentrant.
This commit is contained in:
parent
a2b7f40513
commit
fea2af1e9b
18 changed files with 113 additions and 78 deletions
|
@ -31,6 +31,7 @@ error = 'calendar error'
|
|||
# Turn seconds since epoch into calendar time
|
||||
def gmtime(secs):
|
||||
if secs < 0: raise error, 'negative input to gmtime()'
|
||||
secs = int(secs)
|
||||
mins, secs = divmod(secs, 60)
|
||||
hours, mins = divmod(mins, 60)
|
||||
days, hours = divmod(hours, 24)
|
||||
|
@ -146,7 +147,7 @@ def monthcalendar(year, month):
|
|||
key = `year` + month_abbr[month]
|
||||
try:
|
||||
return mc_cache[key]
|
||||
except IOError:
|
||||
except KeyError:
|
||||
mc_cache[key] = ret = _monthcalendar(year, month)
|
||||
return ret
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue