Fix django pre/post pyhton 3.5 confusion

mbourqui · Jul 2, 2018 · b34eb65 · b34eb65
1 parent 3d55f40
commit b34eb65
Showing 1 changed file with 12 additions and 12 deletions.
diff --git a/celery_growthmonitor/canvas.py b/celery_growthmonitor/canvas.py
@@ -11,32 +11,32 @@
 
 def pre(job_holder: JobHolder, *tasks):
     if sys.version_info < (3, 5):
-        flow = "(start.s(job_holder),"
-        if tasks:
-            flow += "*tasks,"
-    else:
         flow = (start.s(job_holder),)
         if tasks:
             flow += tuple([task for task in tasks])
+    else:
+        flow = "(start.s(job_holder),"
+        if tasks:
+            flow += "*tasks,"
     return flow
 
 
 def post(*tasks):
     if sys.version_info < (3, 5):
+        flow = ()
+        if tasks:
+            flow += tuple([task for task in tasks])
+        flow += (stop.s(),)
+        if settings.TTL.seconds > 0:
+            flow += (remove_old_jobs.s(),)
+    else:
         flow = ""
         if tasks:
             flow += "*tasks,"
         flow += "stop.s()"
         if settings.TTL.seconds > 0:
             flow += ",remove_old_jobs.s()"
         flow += ")"
-    else:
-        flow = ()
-        if tasks:
-            flow += tuple([task for task in tasks])
-        flow += (stop.s(),)
-        if settings.TTL.seconds > 0:
-            flow += (remove_old_jobs.s(),)
     return flow
 
 
@@ -68,7 +68,7 @@ def chain_pre(job_holder: JobHolder, *tasks):
         flow = eval(pre(job_holder, tasks))
     except SyntaxError:
         # Python < 3.5
-        flow = pre(job_holder,  tasks)
+        flow = pre(job_holder, tasks)
     return celery_chain(*flow)