1.1 --- a/imiptools/data.py Sun May 17 18:47:06 2015 +0200
1.2 +++ b/imiptools/data.py Sun May 17 18:53:18 2015 +0200
1.3 @@ -23,7 +23,7 @@
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, \
1.8 + get_freebusy_period, get_period, get_tzid, \
1.9 to_timezone, to_utc_datetime
1.10 from imiptools.period import Period, RecurringPeriod, period_overlaps
1.11 from vCalendar import iterwrite, parse, ParseError, to_dict, to_node
1.12 @@ -403,9 +403,6 @@
1.13 def get_window_end(tzid, window_size=100):
1.14 return to_timezone(datetime.now(), tzid) + timedelta(window_size)
1.15
1.16 -def get_tzid(dtstart_attr, dtend_attr):
1.17 - return dtstart_attr.get("TZID") or dtend_attr.get("TZID")
1.18 -
1.19 def get_periods(obj, tzid, window_end, inclusive=False):
1.20
1.21 """
2.1 --- a/imiptools/dates.py Sun May 17 18:47:06 2015 +0200
2.2 +++ b/imiptools/dates.py Sun May 17 18:53:18 2015 +0200
2.3 @@ -143,6 +143,15 @@
2.4 else:
2.5 return None
2.6
2.7 +def get_tzid(dtstart_attr, dtend_attr):
2.8 +
2.9 + """
2.10 + Return any time regime details from the given 'dtstart_attr' and
2.11 + 'dtend_attr' attribute collections.
2.12 + """
2.13 +
2.14 + return dtstart_attr.get("TZID") or dtend_attr.get("TZID")
2.15 +
2.16 def get_datetime_attributes(dt, tzid=None):
2.17
2.18 "Return attributes for 'dt' and 'tzid'."
3.1 --- a/imiptools/period.py Sun May 17 18:47:06 2015 +0200
3.2 +++ b/imiptools/period.py Sun May 17 18:53:18 2015 +0200
3.3 @@ -22,8 +22,8 @@
3.4 from bisect import bisect_left, bisect_right, insort_left
3.5 from datetime import date, datetime, timedelta
3.6 from imiptools.dates import format_datetime, get_datetime, \
3.7 - get_datetime_attributes, \
3.8 - get_start_of_day, to_timezone, to_utc_datetime
3.9 + get_datetime_attributes, get_start_of_day, \
3.10 + get_tzid, to_timezone, to_utc_datetime
3.11
3.12 class Period:
3.13
4.1 --- a/imipweb/event.py Sun May 17 18:47:06 2015 +0200
4.2 +++ b/imipweb/event.py Sun May 17 18:53:18 2015 +0200
4.3 @@ -19,13 +19,11 @@
4.4 this program. If not, see <http://www.gnu.org/licenses/>.
4.5 """
4.6
4.7 -from datetime import date, datetime, timedelta
4.8 +from datetime import date, timedelta
4.9 from imiptools.client import update_attendees, update_participation
4.10 from imiptools.data import get_uri, uri_dict, uri_values
4.11 -from imiptools.dates import end_date_from_calendar, format_datetime, \
4.12 - get_datetime, get_datetime_item, get_period_item, \
4.13 - to_date, to_datetime, \
4.14 - to_recurrence_start, to_timezone, to_utc_datetime
4.15 +from imiptools.dates import format_datetime, get_datetime, get_datetime_item, \
4.16 + get_period_item, to_date, to_datetime, to_timezone
4.17 from imiptools.mail import Messenger
4.18 from imiptools.period import have_conflict
4.19 from imipweb.data import EventPeriod, \