File tree Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Expand file tree Collapse file tree 2 files changed +9
-7
lines changed Original file line number Diff line number Diff line change 3030except 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
Original file line number Diff line number Diff line change 33from django .core .urlresolvers import reverse
44from django .db import models
55from 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+
127from django .utils .translation import ugettext_lazy as _
138from django .utils .encoding import python_2_unicode_compatible
149from django .core .exceptions import ImproperlyConfigured
1510
1611from .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
1813from .generators import generate_client_secret , generate_client_id
1914from .validators import validate_uris
2015
You can’t perform that action at this time.
0 commit comments