1.1 --- a/imiptools/data.py Tue Mar 24 16:14:55 2015 +0100
1.2 +++ b/imiptools/data.py Tue Mar 24 18:14:09 2015 +0100
1.3 @@ -23,8 +23,8 @@
1.4 from datetime import datetime, timedelta
1.5 from email.mime.text import MIMEText
1.6 from imiptools.dates import format_datetime, get_datetime, get_duration, \
1.7 - get_freebusy_period, get_period, to_timezone, \
1.8 - to_utc_datetime
1.9 + get_freebusy_period, get_period, to_datetime, \
1.10 + to_timezone, to_utc_datetime
1.11 from imiptools.period import period_overlaps
1.12 from pytz import timezone
1.13 from vCalendar import iterwrite, parse, ParseError, to_dict, to_node
2.1 --- a/imiptools/dates.py Tue Mar 24 16:14:55 2015 +0100
2.2 +++ b/imiptools/dates.py Tue Mar 24 18:14:09 2015 +0100
2.3 @@ -249,6 +249,18 @@
2.4
2.5 return date(dt.year, dt.month, dt.day)
2.6
2.7 +def to_datetime(dt, tzid):
2.8 +
2.9 + """
2.10 + Return a datetime for 'dt', using the start of day for dates, and using the
2.11 + 'tzid' for the conversion.
2.12 + """
2.13 +
2.14 + if isinstance(dt, datetime):
2.15 + return dt
2.16 + else:
2.17 + return get_start_of_day(dt, tzid)
2.18 +
2.19 def get_start_of_day(dt, tzid):
2.20
2.21 """