fix to make travis works

Author: wtayyeb

src/oscar_accounts/abstract_models.py

@@ -11,7 +11,10 @@
 from treebeard.mp_tree import MP_Node
 
 from oscar_accounts import exceptions
-from oscar_accounts.compact_oscar import AUTH_USER_MODEL
+
+# from oscar.core.compat
+# A setting that can be used in foreign key declarations
+AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
 
 
 class ActiveAccountManager(models.Manager):

src/oscar_accounts/compact_oscar.py

@@ -5,19 +5,9 @@
     from importlib import import_module
     from django.apps import apps
     from django.apps.config import MODELS_MODULE_NAME
-    from django.conf import settings
-    from django.core.exceptions import ImproperlyConfigured, AppRegistryNotReady
+    from django.core.exceptions import AppRegistryNotReady
     from django import forms
 
-    # from oscar.core.compat
-    # A setting that can be used in foreign key declarations
-    AUTH_USER_MODEL = getattr(settings, 'AUTH_USER_MODEL', 'auth.User')
-    try:
-        AUTH_USER_APP_LABEL, AUTH_USER_MODEL_NAME = AUTH_USER_MODEL.rsplit('.', 1)
-    except ValueError:
-        raise ImproperlyConfigured("AUTH_USER_MODEL must be of the form"
-                                   " 'app_label.model_name'")
-
     # from oscar.core.loading
     def get_model(app_label, model_name):
         """
@@ -88,7 +78,6 @@ def post_process_urls(self, urlpatterns):
 else:  # oscar is installed, use it.
     from oscar.apps.payment.exceptions import UnableToTakePayment
     from oscar.core.application import Application
-    from oscar.core.compat import AUTH_USER_MODEL
     from oscar.core.loading import get_model, is_model_registered
     from oscar.forms.widgets import DatePickerInput
     from oscar.templatetags.currency_filters import currency