From 282f5de56aba87734048083de4e36778e2e4d75b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Thu, 23 Mar 2017 10:36:51 +0100 Subject: [PATCH] Fixing compatibility with python 3.4 --- taiga/projects/services/bulk_update_order.py | 3 +-- taiga/projects/services/members.py | 5 +++-- taiga/projects/services/modules_config.py | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/taiga/projects/services/bulk_update_order.py b/taiga/projects/services/bulk_update_order.py index 093c97e8..3f2884d4 100644 --- a/taiga/projects/services/bulk_update_order.py +++ b/taiga/projects/services/bulk_update_order.py @@ -19,8 +19,6 @@ from django.db import transaction, connection from django.core.exceptions import ObjectDoesNotExist -from taiga.projects import models - from contextlib import suppress @@ -88,6 +86,7 @@ def update_projects_order_in_bulk(bulk_data: list, field: str, user): apply_order_updates(memberships_orders, new_memberships_orders) from taiga.base.utils import db + from taiga.projects import models db.update_attr_in_bulk_for_ids(memberships_orders, field, model=models.Membership) diff --git a/taiga/projects/services/members.py b/taiga/projects/services/members.py index e5d2f352..b9953d1b 100644 --- a/taiga/projects/services/members.py +++ b/taiga/projects/services/members.py @@ -24,8 +24,6 @@ from django.conf import settings from django.core.validators import validate_email from django.utils.translation import ugettext as _ -from .. import models - def get_members_from_bulk(bulk_data, **additional_fields): """Convert `bulk_data` into a list of members. @@ -48,6 +46,8 @@ def get_members_from_bulk(bulk_data, **additional_fields): data_copy["user_id"] = user.id data_copy.update(additional_fields) + + from .. import models members.append(models.Membership(**data_copy)) return members @@ -67,6 +67,7 @@ def create_members_in_bulk(bulk_data, callback=None, precall=None, **additional_ def remove_user_from_project(user, project): + from .. import models models.Membership.objects.get(project=project, user=user).delete() diff --git a/taiga/projects/services/modules_config.py b/taiga/projects/services/modules_config.py index 54e88c4b..93bdfc03 100644 --- a/taiga/projects/services/modules_config.py +++ b/taiga/projects/services/modules_config.py @@ -18,11 +18,11 @@ import importlib -from .. import models from django.conf import settings def get_modules_config(project): + from .. import models modules_config, created = models.ProjectModulesConfig.objects.get_or_create(project=project) if created or modules_config.config == None: