# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1426012845 -3600
# Node ID b305879fa5064d0b20a018d26637e7e7c693dd93
# Parent  560b39ad7b2ce842ea1b783b90f92fcfc502366d
Eliminated TZID propagation when event attributes will be consulted anyway.

diff -r 560b39ad7b2c -r b305879fa506 imip_manager.py
--- a/imip_manager.py	Tue Mar 10 19:30:23 2015 +0100
+++ b/imip_manager.py	Tue Mar 10 19:40:45 2015 +0100
@@ -929,14 +929,14 @@
                 # Obtain the datetime.
 
                 if name == "DTSTART":
-                    dt, attr, event_tzid = dtstart, dtstart_attr, dtstart_attr.get("TZID", tzid)
+                    dt, attr = dtstart, dtstart_attr
 
                 # Where no end datetime exists, use the start datetime as the
                 # basis of any potential datetime specified if dt-control is
                 # set.
 
                 else:
-                    dt, attr, event_tzid = dtend or dtstart, dtend_attr or dtstart_attr, (dtend_attr or dtstart_attr).get("TZID", tzid)
+                    dt, attr = dtend or dtstart, dtend_attr or dtstart_attr
 
                 # Show controls for editing as organiser.
 
@@ -950,7 +950,7 @@
                         page.div.close()
 
                     page.div(class_="dt enabled")
-                    self._show_date_controls(field, value, attr, tzid)
+                    self._show_date_controls(field, value, attr)
                     if name == "DTSTART":
                         page.br()
                         page.label("Specify times", for_="dttimes-enable", class_="time disabled enable")
@@ -1888,18 +1888,17 @@
                 page.option(label, value=v)
         page.select.close()
 
-    def _show_date_controls(self, name, default, attr, tzid):
+    def _show_date_controls(self, name, default, attr):
 
         """
         Show date controls for a field with the given 'name' and 'default' value
-        and 'attr', with the given 'tzid' being used if no other time regime
-        information is provided.
+        and 'attr'.
         """
 
         page = self.page
         args = self.env.get_args()
 
-        event_tzid = attr.get("TZID", tzid)
+        event_tzid = attr.get("TZID", self.get_tzid())
         dt = get_datetime(default, attr)
 
         # Show dates for up to one week around the current date.