Indicate that date preparation methods are private

seantis · Feb 10, 2015 · b6f6692 · b6f6692
1 parent d8fbafe
commit b6f6692
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 18 deletions.
diff --git a/libres/db/models/allocation.py b/libres/db/models/allocation.py
@@ -179,7 +179,7 @@ def display_end(self, timezone=None):
         end = self.end + timedelta(microseconds=1)
         return calendar.to_timezone(end, timezone or self.timezone)
 
-    def prepare_daterange(self, start, end):
+    def _prepare_range(self, start, end):
         if start:
             start = calendar.standardize_date(start, self.timezone)
         if end:
@@ -209,15 +209,15 @@ def whole_day(self):
     def overlaps(self, start, end):
         """ Returns true if the allocation overlaps with the given dates. """
 
-        start, end = self.prepare_daterange(start, end)
+        start, end = self._prepare_range(start, end)
         start, end = rasterize_span(start, end, self.raster)
 
         return calendar.overlaps(start, end, self.start, self.end)
 
     def contains(self, start, end):
         """ Returns true if the the allocation contains the given dates. """
 
-        start, end = self.prepare_daterange(start, end)
+        start, end = self._prepare_range(start, end)
         start, end = rasterize_span(start, end, self.raster)
 
         return self.start <= start and end <= self.end
@@ -238,7 +238,7 @@ def align_dates(self, start=None, end=None):
 
         """
 
-        start, end = self.prepare_daterange(start, end)
+        start, end = self._prepare_range(start, end)
 
         start = start or self.start
         start = start < self.start and self.start or start

diff --git a/libres/db/scheduler.py b/libres/db/scheduler.py
@@ -77,18 +77,15 @@ def resource(self):
         """
         return self.generate_uuid(self.name)
 
-    def prepare_date(self, date):
-        return calendar.standardize_date(date, self.timezone)
-
-    def prepare_dates(self, dates):
+    def _prepare_dates(self, dates):
         return [
             (
                 calendar.standardize_date(s, self.timezone),
                 calendar.standardize_date(e, self.timezone)
             ) for s, e in utils.pairs(dates)
         ]
 
-    def prepare_range(self, start, end):
+    def _prepare_range(self, start, end):
         return (
             calendar.standardize_date(start, self.timezone),
             calendar.standardize_date(end, self.timezone)
@@ -195,7 +192,7 @@ def allocations_by_reservation(self, token, id=None):
         return query
 
     def allocations_in_range(self, start, end, masters_only=True):
-        start, end = self.prepare_range(start, end)
+        start, end = self._prepare_range(start, end)
 
         query = self.managed_allocations()
         query = self.queries.allocations_in_range(query, start, end)
@@ -280,7 +277,7 @@ def allocate(
         that allocation. See Scheduler.__doc__
 
         """
-        dates = self.prepare_dates(dates)
+        dates = self._prepare_dates(dates)
 
         group = new_uuid()
         quota = quota or 1
@@ -499,7 +496,7 @@ def availability(self, start=None, end=None):
         start = start if start else calendar.mindatetime
         end = end if end else calendar.maxdatetime
 
-        start, end = self.prepare_range(start, end)
+        start, end = self._prepare_range(start, end)
 
         return self.queries.availability_by_range(start, end, [self.resource])
 
@@ -512,8 +509,7 @@ def move_allocation(
         assert master_id
         assert any([new_start and new_end, group, new_quota])
 
-        new_start = self.prepare_date(new_start)
-        new_end = self.prepare_date(new_end)
+        new_start, new_end = self._prepare_range(new_start, new_end)
 
         # Find allocation
         master = self.allocation_by_id(master_id)
@@ -679,7 +675,7 @@ def reserve(
         if group:
             dates = self.allocation_dates_by_group(group)
 
-        dates = self.prepare_dates(dates)
+        dates = self._prepare_dates(dates)
 
         # First, the request is checked for saneness. If any requested
         # date cannot be reserved the request as a whole fails.
@@ -969,8 +965,7 @@ def change_reservation_time(self, token, id, new_start, new_end):
         # if the reservation has not been approved yet
         assert new_start and new_end
 
-        new_start = self.prepare_date(new_start)
-        new_end = self.prepare_date(new_end)
+        new_start, new_end = self._prepare_range(new_start, new_end)
 
         existing_reservation = self.reservations_by_token(token, id).one()
 
@@ -1098,7 +1093,7 @@ def search_allocations(
         assert start
         assert end
 
-        start, end = self.prepare_range(start, end)
+        start, end = self._prepare_range(start, end)
 
         assert whole_day in ('yes', 'no', 'any')
         assert groups in ('yes', 'no', 'any')