From eb5f49f28bcb706bce1a8cccb38bc5e0858770e9 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Dec 20 2018 11:15:34 +0000
Subject: Fix getting the workers running with python2


Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/git.py b/pagure/lib/git.py
index 467c395..82be06e 100644
--- a/pagure/lib/git.py
+++ b/pagure/lib/git.py
@@ -39,10 +39,10 @@ import pagure.utils
 import pagure.exceptions
 import pagure.lib.query
 import pagure.lib.notify
+import pagure.lib.tasks
 from pagure.config import config as pagure_config
 from pagure.lib import model
 from pagure.lib.repo import PagureRepo
-from pagure.lib import tasks
 import pagure.hooks
 
 # from pagure.hooks import run_project_hooks
@@ -158,14 +158,16 @@ def generate_gitolite_acls(project=None, group=None):
 
     """
     if project != -1:
-        task = tasks.generate_gitolite_acls.delay(
+        task = pagure.lib.tasks.generate_gitolite_acls.delay(
             namespace=project.namespace if project else None,
             name=project.name if project else None,
             user=project.user.user if project and project.is_fork else None,
             group=group,
         )
     else:
-        task = tasks.generate_gitolite_acls.delay(name=-1, group=group)
+        task = pagure.lib.tasks.generate_gitolite_acls.delay(
+            name=-1, group=group
+        )
     return task
 
 
@@ -2154,7 +2156,7 @@ def diff_pull_request(
         session.add(request)
         session.commit()
 
-        tasks.sync_pull_ref.delay(
+        pagure.lib.tasks.sync_pull_ref.delay(
             request.project.name,
             request.project.namespace,
             request.project.user.username if request.project.is_fork else None,
@@ -2162,7 +2164,7 @@ def diff_pull_request(
         )
 
         if commenttext:
-            tasks.link_pr_to_ticket.delay(request.uid)
+            pagure.lib.tasks.link_pr_to_ticket.delay(request.uid)
             if notify:
                 if pr_action:
                     pagure.lib.notify.log(
diff --git a/pagure/lib/query.py b/pagure/lib/query.py
index 6a8158c..76be22d 100644
--- a/pagure/lib/query.py
+++ b/pagure/lib/query.py
@@ -58,12 +58,12 @@ import pagure.lib.git_auth
 import pagure.lib.login
 import pagure.lib.notify
 import pagure.lib.plugins
+import pagure.lib.tasks
+import pagure.lib.tasks_services
 import pagure.pfmarkdown
 import pagure.utils
 from pagure.config import config as pagure_config
 from pagure.lib import model
-from pagure.lib import tasks
-from pagure.lib import tasks_services
 
 
 REDIS = None
@@ -1386,7 +1386,7 @@ def add_pull_request_comment(
         and request.project.ci_hook.active_pr
         and not request.project.private
     ):
-        tasks_services.trigger_ci_build.delay(
+        pagure.lib.tasks_services.trigger_ci_build.delay(
             pr_uid=request.uid,
             cause=request.id,
             branch=request.branch_from,
@@ -1410,7 +1410,7 @@ def add_pull_request_comment(
         and request.project.ci_hook
         and request.project.ci_hook.active_pr
     ):
-        tasks_services.trigger_ci_build.delay(
+        pagure.lib.tasks_services.trigger_ci_build.delay(
             pr_uid=request.uid,
             cause=request.id,
             branch=request.branch_from,
@@ -1736,7 +1736,7 @@ def new_project(
         ),
     )
 
-    return tasks.create_project.delay(
+    return pagure.lib.tasks.create_project.delay(
         user_obj.username, namespace, name, add_readme, ignore_existing_repo
     )
 
@@ -1945,7 +1945,7 @@ def new_pull_request(
         and request.project.ci_hook.active_pr
         and not request.project.private
     ):
-        tasks_services.trigger_ci_build.delay(
+        pagure.lib.tasks_services.trigger_ci_build.delay(
             pr_uid=request.uid,
             cause=request.id,
             branch=request.branch_from,
@@ -1953,7 +1953,7 @@ def new_pull_request(
         )
 
     # Create the ref from the start
-    tasks.sync_pull_ref.delay(
+    pagure.lib.tasks.sync_pull_ref.delay(
         request.project.name,
         request.project.namespace,
         request.project.user.username if request.project.is_fork else None,
@@ -2275,7 +2275,7 @@ def fork_project(session, user, repo, editbranch=None, editfile=None):
     session.flush()
     session.commit()
 
-    task = tasks.fork.delay(
+    task = pagure.lib.tasks.fork.delay(
         repo.name,
         repo.namespace,
         repo.user.username if repo.is_fork else None,
@@ -3366,7 +3366,7 @@ def add_attachment(repo, issue, attachmentfolder, user, filename, filestream):
     with open(filepath, "wb") as stream:
         stream.write(filestream.read())
 
-    tasks.add_file_to_git.delay(
+    pagure.lib.tasks.add_file_to_git.delay(
         repo.name,
         repo.namespace,
         repo.user.username if repo.is_fork else None,