continue fixes on timezone bug

aircox/models.py

@@ -37,7 +37,7 @@ class RelatedManager(models.Manager):
         if not model and object:
             model = type(object)
 
-        qs = qs or self
+        qs = self if qs is None else qs
         if hasattr(model, '__iter__'):
             model = [ ContentType.objects.get_for_model(m).id
                         for m in model ]
@@ -338,7 +338,7 @@ class Station(Nameable):
 
 class ProgramManager(models.Manager):
     def station(self, station, qs = None):
-        qs = qs or self
+        qs = self if qs is None else qs
         return qs.filter(station = station)
 
 class Program(Nameable):
@@ -717,7 +717,7 @@ class Schedule(models.Model):
 
 class DiffusionManager(models.Manager):
     def station(self, station, qs = None):
-        qs = qs or self
+        qs = self if qs is None else qs
         return qs.filter(program__station = station)
 
     @staticmethod
@@ -749,7 +749,7 @@ class DiffusionManager(models.Manager):
         # note: we work with localtime
         date = utils.date_or_default(date, keep_type = True)
 
-        qs = qs or self
+        qs = self if qs is None else qs
         filters = None
         if isinstance(date, datetime.datetime):
             # use datetime: we want diffusion that occurs around this
@@ -789,7 +789,7 @@ class DiffusionManager(models.Manager):
         date.
         """
         date = utils.date_or_default(date)
-        qs = qs or self
+        qs = self if qs is None else qs
         return self.station(station, qs).filter(
             end__lte = date,
         ).order_by('start')
@@ -1203,7 +1203,7 @@ class Port (models.Model):
 
 class LogManager(RelatedManager):
     def station(self, station, qs = None):
-        qs = qs or self
+        qs = self if qs is None else qs
         return qs.filter(station = station)
 
     def get_for(self, station, *args, **kwargs):
@@ -1212,7 +1212,7 @@ class LogManager(RelatedManager):
 
     def _at(self, date = None, qs = None):
         start, end = utils.date_range(date)
-        qs = qs or self
+        qs = self if qs is None else qs
         return qs.filter(date__gte = start,
                          date__lte = end)
 

aircox_cms/models.py

@@ -577,6 +577,9 @@ class DiffusionPage(Publication):
         Return a list of podcasts, with archive as the first item of the
         list when available.
         """
+        if not self.diffusion:
+            return
+
         podcasts = []
         archive = self.get_archive()
         if archive:

notes.md

@@ -42,8 +42,9 @@ cms:
 # Timezone shit:
 - run tests:
     - streamer: dealer & streams hours (to localtime)
-    - diffusions: update & check
-    - check in templates
+    - diffusions: update & check algorithms
+    x check in templates
+    x diffusion page date info
 
 # Instance's TODO
 - menu_top .sections:

requirements.txt

@@ -13,4 +13,5 @@ Pillow>=3.3.0
 django-modelcluster==2.0
 django-honeypot>=0.5.0
 django-jet>=1.0.3
+mutagen>=1.37