Skip to content

Commit f3f232e

Browse files
committed
moved get_model method in compat module
1 parent 8a43351 commit f3f232e

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

oauth2_provider/compat.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,3 +30,10 @@
3030
except ImportError:
3131
from django.contrib.auth.models import User
3232
get_user_model = lambda: User
33+
34+
# Django's new application loading system
35+
try:
36+
from django.apps import apps
37+
get_model = apps.get_model
38+
except ImportError:
39+
from django.db.models import get_model

oauth2_provider/models.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,13 @@
33
from django.core.urlresolvers import reverse
44
from django.db import models
55
from django.utils import timezone
6-
try:
7-
# Django's new application loading system
8-
from django.apps import apps
9-
get_model = apps.get_model
10-
except ImportError:
11-
from django.db.models import get_model
6+
127
from django.utils.translation import ugettext_lazy as _
138
from django.utils.encoding import python_2_unicode_compatible
149
from django.core.exceptions import ImproperlyConfigured
1510

1611
from .settings import oauth2_settings
17-
from .compat import AUTH_USER_MODEL, parse_qsl, urlparse
12+
from .compat import AUTH_USER_MODEL, parse_qsl, urlparse, get_model
1813
from .generators import generate_client_secret, generate_client_id
1914
from .validators import validate_uris
2015

0 commit comments

Comments
 (0)