[Zope3-checkins] SVN: Zope3/branches/3.2/src/ClientCookie/_Util.py
Merged revision 67772 from the trunk:
Dmitry Vasiliev
dima at hlabs.spb.ru
Tue May 2 09:20:42 EDT 2006
Log message for revision 67836:
Merged revision 67772 from the trunk:
Fixed a few indentation errors
Changed:
U Zope3/branches/3.2/src/ClientCookie/_Util.py
-=-
Modified: Zope3/branches/3.2/src/ClientCookie/_Util.py
===================================================================
--- Zope3/branches/3.2/src/ClientCookie/_Util.py 2006-05-02 12:57:33 UTC (rev 67835)
+++ Zope3/branches/3.2/src/ClientCookie/_Util.py 2006-05-02 13:20:41 UTC (rev 67836)
@@ -98,12 +98,12 @@
# Return 1 for leap years, 0 for non-leap years
def isleap(year):
- return year % 4 == 0 and (year % 100 <> 0 or year % 400 == 0)
+ return year % 4 == 0 and (year % 100 <> 0 or year % 400 == 0)
# Return number of leap years in range [y1, y2)
# Assume y1 <= y2 and no funny (non-leap century) years
def leapdays(y1, y2):
- return (y2+3)/4 - (y1+3)/4
+ return (y2+3)/4 - (y1+3)/4
EPOCH = 1970
def timegm(tuple):
@@ -220,12 +220,12 @@
sec = int(sec)
if yr < 1000:
- # find "obvious" year
- cur_yr = time.localtime(time.time())[0]
- m = cur_yr % 100
- tmp = yr
- yr = yr + cur_yr - m
- m = m - tmp
+ # find "obvious" year
+ cur_yr = time.localtime(time.time())[0]
+ m = cur_yr % 100
+ tmp = yr
+ yr = yr + cur_yr - m
+ m = m - tmp
if abs(m) > 50:
if m > 0: yr = yr + 100
else: yr = yr - 100
@@ -257,7 +257,7 @@
(?:\s+|[-\/])
(\d+) # year
(?:
- (?:\s+|:) # separator before clock
+ (?:\s+|:) # separator before clock
(\d\d?):(\d\d) # hour:min
(?::(\d\d))? # optional seconds
)? # optional clock
More information about the Zope3-Checkins
mailing list