Skip to content

Commit 8358c9e

Browse files
committed
fixes wrong import
1 parent 04072f9 commit 8358c9e

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

src/concurrency/compat.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,18 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import absolute_import, print_function, unicode_literals
33

4-
# from django.core.urlresolvers import get_callable
5-
# from django.db.transaction import atomic
6-
74
try:
85
from django.template.base import TemplateDoesNotExist
96
except ImportError:
107
from django.template.exceptions import TemplateDoesNotExist # noqa - django 1.9
8+
9+
# try:
10+
# from django.db.transaction import atomic
11+
# except ImportError:
12+
# from django.db.transaction import commit_on_success as atomic # noqa
13+
#
14+
15+
try:
16+
from django.urls.utils import get_callable
17+
except ImportError:
18+
from django.core.urlresolvers import get_callable

src/concurrency/config.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,10 @@
33

44
from django.core.exceptions import ImproperlyConfigured
55
from django.test.signals import setting_changed
6-
from django.urls import get_callable
76
from django.utils import six
87

8+
from .compat import get_callable
9+
910
# List Editable Policy
1011
# 0 do not save updated records, save others, show message to the user
1112
# 1 abort whole transaction

src/concurrency/triggers.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
from django.db import connections, router
88
from django.db.utils import DatabaseError
99

10+
from .fields import _TRIGGERS # noqa
1011

1112
def get_trigger_name(field):
1213
"""

0 commit comments

Comments
 (0)