cubicweb: comparison utils.py

equal deleted inserted replaced

-:a721966779be
+:cba9f175da2d
 import locale
 from md5 import md5
 from datetime import datetime, timedelta, date
 from time import time
 from random import randint, seed
+from calendar import monthrange
 # initialize random seed from current time
 seed()
 try:
 strptime = datetime.strptime
 except AttributeError: # py < 2.5
 from time import strptime as time_strptime
 def strptime(value, format):
 def todate(somedate):
 """return a date from a date (leaving unchanged) or a datetime"""
 if isinstance(somedate, datetime):
 return date(somedate.year, somedate.month, somedate.day)
-assert isinstance(somedate, date)
+assert isinstance(somedate, date), repr(somedate)
-return date
+return somedate
-def date_range(begin, end, incr=1, include=None):
+def todatetime(somedate):
+"""return a date from a date (leaving unchanged) or a datetime"""
+if isinstance(somedate, date):
+return datetime(somedate.year, somedate.month, somedate.day)
+assert isinstance(somedate, datetime), repr(somedate)
+return somedate
+ONEDAY = timedelta(days=1)
+ONEWEEK = timedelta(days=7)
+def days_in_month(date_):
+return monthrange(date_.year, date_.month)[1]
+def previous_month(date_, nbmonth=1):
+while nbmonth:
+date_ = first_day(date_) - ONEDAY
+nbmonth -= 1
+return date_
+def next_month(date_, nbmonth=1):
+while nbmonth:
+date_ = last_day(date_) + ONEDAY
+nbmonth -= 1
+return date_
+def first_day(date_):
+return date(date_.year, date_.month, 1)
+def last_day(date_):
+return date(date_.year, date_.month, days_in_month(date_))
+def date_range(begin, end, incday=None, incmonth=None):
 """yields each date between begin and end
 :param begin: the start date
 :param end: the end date
 :param incr: the step to use to iterate over dates. Default is
 one day.
 :param include: None (means no exclusion) or a function taking a
 date as parameter, and returning True if the date
 should be included.
 """
-incr = timedelta(incr, 0, 0)
+assert not (incday and incmonth)
-while begin <= end:
+begin = todate(begin)
-if include is None or include(begin):
+end = todate(end)
+if incmonth:
+while begin < end:
+begin = next_month(begin, incmonth)
 yield begin
-begin += incr
+else:
+if not incday:
+incr = ONEDAY
+else:
+incr = timedelta(incday)
+while begin <= end:
+yield begin
+begin += incr
 def ustrftime(date, fmt='%Y-%m-%d'):
 """like strftime, but returns a unicode string instead of an encoded
-string which may be problematic with localized date.
+string which' may be problematic with localized date.
 encoding is guessed by locale.getpreferredencoding()
 """
 # date format may depend on the locale
 encoding = locale.getpreferredencoding(do_setlocale=False) or 'UTF-8'
 return unicode(date.strftime(str(fmt)), encoding)
 def merge_dicts(dict1, dict2):
 """update a copy of `dict1` with `dict2`"""
 dict1 = dict(dict1)
 dict1.update(dict2)
 return dict1
 class SizeConstrainedList(list):
 """simple list that makes sure the list does not get bigger
 than a given size.
 specifed in the constructor
 """
 def __nonzero__(self):
 return True
 def write(self, value):
 assert isinstance(value, unicode), u"unicode required not %s : %s"\
 % (type(value).__name__, repr(value))
 self.append(value)
 def getvalue(self):
 return u''.join(self)
 def __repr__(self):
 return '<%s at %#x>' % (self.__class__.__name__, id(self))
 def add_onload(self, jscode):
 self.add_post_inline_script(u"""jQuery(document).ready(function () {
 %s
 });""" % jscode)
 def add_js(self, jsfile):
 """adds `jsfile` to the list of javascripts used in the webpage
 This function checks if the file has already been added
 :param jsfile: the script's URL
 w(u'\n</script>\n')
 header = super(HTMLHead, self).getvalue()
 if skiphead:
 return header
 return u'<head>\n%s</head>\n' % header
 class HTMLStream(object):
 """represents a HTML page.
 This is used my main templates so that HTML headers can be added
 at any time during the page generation.
 HTMLStream uses the (U)StringIO interface to be compliant with
 existing code.
 """
 def __init__(self, req):
 # stream for <head>
 self.head = req.html_headers
 # main stream
 self.body = UStringIO()

branch	tls-sprint
changeset 1715	cba9f175da2d
parent 1711	182536159750
child 1751	59e9a4f5bfea