Merge pull request #25 from edx/renzo/support-old-django

Finer-grained control of how to import the User model

oauth2_provider/management/commands/create_oauth2_client.py

@@ -1,7 +1,6 @@
 import json
 from optparse import make_option
 
-from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.core.management.base import BaseCommand, CommandError
 from django.core.validators import URLValidator
@@ -11,6 +10,13 @@
 from oauth2_provider.models import TrustedClient
 
 
+try:
+    from django.contrib.auth import get_user_model
+except ImportError:  # Django <1.5
+    from django.contrib.auth.models import User
+else:
+    User = get_user_model()
+
 ARG_STRING = '<url> <redirect_uri> <client_type: "confidential" | "public">'