openstack/deb-python-pysaml2
Code Issues Proposed changes

editorial

Browse Source
This commit is contained in:
Roland Hedberg
2013-02-20 14:48:12 +01:00
parent 1ade66f38c
commit ed8b6953bb
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/saml2/time_util.py
View File

@@ -149,13 +149,13 @@ def add_duration(tid, duration):
if days < 1: if days < 1:
pass pass
elif days > maximum_day_in_month_for(year, month): elif days > maximum_day_in_month_for(year, month):
days = days - maximum_day_in_month_for(year, month) days -= maximum_day_in_month_for(year, month)
carry = 1 carry = 1
else: else:
break break
temp = month + carry temp = month + carry
month = modulo(temp, 1, 13) month = modulo(temp, 1, 13)
year = year + f_quotient(temp, 1, 13) year += f_quotient(temp, 1, 13)
return time.localtime(time.mktime((year, month, days, hour, minutes, return time.localtime(time.mktime((year, month, days, hour, minutes,
secs, 0, 0, -1))) secs, 0, 0, -1)))
@@ -232,7 +232,7 @@ def str_to_time(timestr, format=TIME_FORMAT):
return 0 return 0
try: try:
then = time.strptime(timestr, format) then = time.strptime(timestr, format)
except Exception: # assume it's a format problem except ValueError, err: # assume it's a format problem
try: try:
elem = TIME_FORMAT_WITH_FRAGMENT.match(timestr) elem = TIME_FORMAT_WITH_FRAGMENT.match(timestr)
except Exception, exc: except Exception, exc: