# HG changeset patch # User Paul Boddie # Date 1431881598 -7200 # Node ID 9878dc6132889bedaabcde545829b0be0be2883f # Parent 1ffecd8445e9425b2f1e9ee866b63660e61f5108 Tidied imports and fixed get_tzid availability. diff -r 1ffecd8445e9 -r 9878dc613288 imiptools/data.py --- a/imiptools/data.py Sun May 17 18:47:06 2015 +0200 +++ b/imiptools/data.py Sun May 17 18:53:18 2015 +0200 @@ -23,7 +23,7 @@ from datetime import datetime, timedelta from email.mime.text import MIMEText from imiptools.dates import format_datetime, get_datetime, get_duration, \ - get_freebusy_period, get_period, \ + get_freebusy_period, get_period, get_tzid, \ to_timezone, to_utc_datetime from imiptools.period import Period, RecurringPeriod, period_overlaps from vCalendar import iterwrite, parse, ParseError, to_dict, to_node @@ -403,9 +403,6 @@ def get_window_end(tzid, window_size=100): return to_timezone(datetime.now(), tzid) + timedelta(window_size) -def get_tzid(dtstart_attr, dtend_attr): - return dtstart_attr.get("TZID") or dtend_attr.get("TZID") - def get_periods(obj, tzid, window_end, inclusive=False): """ diff -r 1ffecd8445e9 -r 9878dc613288 imiptools/dates.py --- a/imiptools/dates.py Sun May 17 18:47:06 2015 +0200 +++ b/imiptools/dates.py Sun May 17 18:53:18 2015 +0200 @@ -143,6 +143,15 @@ else: return None +def get_tzid(dtstart_attr, dtend_attr): + + """ + Return any time regime details from the given 'dtstart_attr' and + 'dtend_attr' attribute collections. + """ + + return dtstart_attr.get("TZID") or dtend_attr.get("TZID") + def get_datetime_attributes(dt, tzid=None): "Return attributes for 'dt' and 'tzid'." diff -r 1ffecd8445e9 -r 9878dc613288 imiptools/period.py --- a/imiptools/period.py Sun May 17 18:47:06 2015 +0200 +++ b/imiptools/period.py Sun May 17 18:53:18 2015 +0200 @@ -22,8 +22,8 @@ from bisect import bisect_left, bisect_right, insort_left from datetime import date, datetime, timedelta from imiptools.dates import format_datetime, get_datetime, \ - get_datetime_attributes, \ - get_start_of_day, to_timezone, to_utc_datetime + get_datetime_attributes, get_start_of_day, \ + get_tzid, to_timezone, to_utc_datetime class Period: diff -r 1ffecd8445e9 -r 9878dc613288 imipweb/event.py --- a/imipweb/event.py Sun May 17 18:47:06 2015 +0200 +++ b/imipweb/event.py Sun May 17 18:53:18 2015 +0200 @@ -19,13 +19,11 @@ this program. If not, see . """ -from datetime import date, datetime, timedelta +from datetime import date, timedelta from imiptools.client import update_attendees, update_participation from imiptools.data import get_uri, uri_dict, uri_values -from imiptools.dates import end_date_from_calendar, format_datetime, \ - get_datetime, get_datetime_item, get_period_item, \ - to_date, to_datetime, \ - to_recurrence_start, to_timezone, to_utc_datetime +from imiptools.dates import format_datetime, get_datetime, get_datetime_item, \ + get_period_item, to_date, to_datetime, to_timezone from imiptools.mail import Messenger from imiptools.period import have_conflict from imipweb.data import EventPeriod, \