work on website; fix stuffs on aircox too

aircox/utils.py

@@ -4,68 +4,59 @@ import django.utils.timezone as tz
 
 def date_range(date):
     """
-    Return a range of datetime for a given day, such as:
-        [date, 0:0:0:0; date, 23:59:59:999]
-
-    Ensure timezone awareness.
+    Return a datetime range for a given day, as:
+    ```(date, 0:0:0:0; date, 23:59:59:999)```.
     """
-    date = date_or_default(date)
-    range = (
-        date.replace(hour = 0, minute = 0, second = 0), \
-        date.replace(hour = 23, minute = 59, second = 59, microsecond = 999)
+    date = date_or_default(date, tz.datetime)
+    return (
+        date.replace(hour=0, minute=0, second=0),
+        date.replace(hour=23, minute=59, second=59, microsecond=999)
     )
-    return range
 
-def cast_date(date, to_datetime = True):
+
+def cast_date(date, into=datetime.date):
     """
-    Given a date reset its time information and
-    return it as a date or datetime object.
-
-    Ensure timezone awareness.
+    Cast a given date into the provided class' instance. Make datetime
+    aware of timezone.
     """
-    if to_datetime:
-        return tz.make_aware(
-            tz.datetime(date.year, date.month, date.day, 0, 0, 0, 0)
-        )
-    return datetime.date(date.year, date.month, date.day)
+    date = into(date.year, date.month, date.day)
+    return tz.make_aware(date) if issubclass(into, tz.datetime) else date
 
-def date_or_default(date, reset_time = False, keep_type = False, to_datetime = True):
+
+def date_or_default(date, into=None):
     """
-    Return datetime or default value (now) if not defined, and remove time info
-    if reset_time is True.
-
-    \param reset_time   reset time info to 0
-    \param keep_type    keep the same type of the given date if not None
-    \param to_datetime  force conversion to datetime if not keep_type
-
-    Ensure timezone awareness.
+    Return date if not None, otherwise return now. Cast result into provided
+    type if any.
     """
-    date = date or tz.now()
-    to_datetime = isinstance(date, tz.datetime) if keep_type else to_datetime
+    date = date if date is not None else datetime.date.today() \
+        if into is not None and issubclass(into, datetime.date) else \
+        tz.datetime.now()
 
-    if reset_time or not isinstance(date, tz.datetime):
-        return cast_date(date, to_datetime)
+    if into is not None:
+        date = cast_date(date, into)
 
-    if not tz.is_aware(date):
+    if isinstance(date, tz.datetime) and not tz.is_aware(date):
         date = tz.make_aware(date)
     return date
 
-def to_timedelta (time):
+
+def to_timedelta(time):
     """
     Transform a datetime or a time instance to a timedelta,
     only using time info
     """
     return datetime.timedelta(
-        hours = time.hour,
-        minutes = time.minute,
-        seconds = time.second
+        hours=time.hour,
+        minutes=time.minute,
+        seconds=time.second
     )
 
-def seconds_to_time (seconds):
+
+def seconds_to_time(seconds):
     """
     Seconds to datetime.time
     """
     minutes, seconds = divmod(seconds, 60)
     hours, minutes = divmod(minutes, 60)
-    return datetime.time(hour = hours, minute = minutes, second = seconds)
+    return datetime.time(hour=hours, minute=minutes, second=seconds)