# HG changeset patch
# User Paul Boddie <paul@boddie.org.uk>
# Date 1438277350 -7200
# Node ID a8b98a2cbdca294f312f2bc244c971df92424249
# Parent  0381acf15bcf50d62728bf720e9b3419315de45b
Tidied imports and naming.

diff -r 0381acf15bcf -r a8b98a2cbdca imipweb/event.py
--- a/imipweb/event.py	Thu Jul 30 19:26:10 2015 +0200
+++ b/imipweb/event.py	Thu Jul 30 19:29:10 2015 +0200
@@ -921,8 +921,8 @@
 
         page = self.page
         args = self.env.get_args()
-        sn = self._suffixed_name
-        ssn = self._simple_suffixed_name
+        _id = self.element_identifier
+        _name = self.element_name
 
         # Add a dynamic stylesheet to permit the controls to modify the display.
         # NOTE: The style details need to be coordinated with the static
@@ -947,15 +947,15 @@
             page.style.close()
 
         self._control(
-            ssn("dtend-control", "recur", index), "checkbox",
+            _name("dtend-control", "recur", index), "checkbox",
             index is not None and str(index) or "enable", p.end_enabled,
-            id=sn("dtend-enable", index)
+            id=_id("dtend-enable", index)
             )
 
         self._control(
-            ssn("dttimes-control", "recur", index), "checkbox",
+            _name("dttimes-control", "recur", index), "checkbox",
             index is not None and str(index) or "enable", p.times_enabled,
-            id=sn("dttimes-enable", index)
+            id=_id("dttimes-enable", index)
             )
 
     def show_datetime_controls(self, obj, formdate, show_start):
@@ -1016,8 +1016,8 @@
         """
 
         page = self.page
-        sn = self._suffixed_name
-        ssn = self._simple_suffixed_name
+        _id = self.element_identifier
+        _name = self.element_name
 
         p = event_period_from_period(period)
         replaced = not recurrenceid and self.is_replaced(p, recurrenceids)
@@ -1031,11 +1031,11 @@
 
             if show_start:
                 page.div(class_="dt enabled")
-                self._show_date_controls(ssn("dtstart", "recur", index), p.get_form_start(), index=index, read_only=read_only)
+                self._show_date_controls(_name("dtstart", "recur", index), p.get_form_start(), index=index, read_only=read_only)
                 if not read_only:
                     page.br()
-                    page.label("Specify times", for_=sn("dttimes-enable", index), class_="time disabled enable")
-                    page.label("Specify dates only", for_=sn("dttimes-enable", index), class_="time enabled disable")
+                    page.label("Specify times", for_=_id("dttimes-enable", index), class_="time disabled enable")
+                    page.label("Specify dates only", for_=_id("dttimes-enable", index), class_="time enabled disable")
                 page.div.close()
 
                 # Put the origin somewhere.
@@ -1045,13 +1045,13 @@
             else:
                 page.div(class_="dt disabled")
                 if not read_only:
-                    page.label("Specify end date", for_=sn("dtend-enable", index), class_="enable")
+                    page.label("Specify end date", for_=_id("dtend-enable", index), class_="enable")
                 page.div.close()
                 page.div(class_="dt enabled")
-                self._show_date_controls(ssn("dtend", "recur", index), p.get_form_end(), index=index, show_tzid=False, read_only=read_only)
+                self._show_date_controls(_name("dtend", "recur", index), p.get_form_end(), index=index, show_tzid=False, read_only=read_only)
                 if not read_only:
                     page.br()
-                    page.label("End on same day", for_=sn("dtend-enable", index), class_="disable")
+                    page.label("End on same day", for_=_id("dtend-enable", index), class_="disable")
                 page.div.close()
 
             page.td.close()
diff -r 0381acf15bcf -r a8b98a2cbdca imipweb/resource.py
--- a/imipweb/resource.py	Thu Jul 30 19:26:10 2015 +0200
+++ b/imipweb/resource.py	Thu Jul 30 19:29:10 2015 +0200
@@ -21,11 +21,10 @@
 
 from datetime import datetime
 from imiptools.client import Client
-from imiptools.data import get_uri, get_window_end, Object, uri_values
-from imiptools.dates import format_datetime, format_time, \
-                            get_recurrence_start_point
+from imiptools.data import get_uri, uri_values
+from imiptools.dates import get_recurrence_start_point
 from imiptools.period import FreeBusyPeriod, is_affected, is_replaced, \
-                             remove_period, remove_affected_period, update_freebusy
+                             remove_period, remove_affected_period
 from imipweb.env import CGIEnvironment
 import babel.dates
 import imip_store
@@ -93,10 +92,10 @@
 
     # Access to objects.
 
-    def _suffixed_name(self, name, index=None):
+    def element_identifier(self, name, index=None):
         return index is not None and "%s-%d" % (name, index) or name
 
-    def _simple_suffixed_name(self, name, suffix, index=None):
+    def element_name(self, name, suffix, index=None):
         return index is not None and "%s-%s" % (name, suffix) or name
 
     def _get_identifiers(self, path_info):