Added defaults file for settings

examples/vanilla/settings.py

@@ -205,11 +205,8 @@ INSTALLED_APPS = (
 LOGIN_REDIRECT_URL = '/shop/accounts/profile/'
 APPEND_SLASH = True
 
-# Oscar settings
-OSCAR_DEFAULT_CURRENCY = 'GBP'
+from oscar.defaults import *
 
-# Max number of products to keep on the user's history
-OSCAR_RECENTLY_VIEWED_PRODUCTS = 4
 
 # Haystack settings
 HAYSTACK_SITECONF = 'oscar.search_sites'

oscar/apps/basket/factory.py

@@ -6,12 +6,10 @@ from oscar.core.loading import import_module
 basket_models = import_module('basket.models', ['Basket', 'Line'])
 offer_utils = import_module('offer.utils', ['Applicator'])
 
-# Cookie keys
-COOKIE_KEY_OPEN_BASKET = 'oscar_open_basket'
-COOKIE_KEY_SAVED_BASKET = 'oscar_saved_basket'
-
-    # The lifetime for the basket cookie can be set in settings.py
-COOKIE_LIFETIME = getattr(settings, 'settings.OSCAR_BASKET_COOKIE_LIFETIME', 7*24*60*60)
+# Basket settings
+COOKIE_KEY_OPEN_BASKET = settings.OSCAR_BASKET_COOKIE_OPEN
+COOKIE_KEY_SAVED_BASKET = settings.OSCAR_BASKET_COOKIE_SAVED
+COOKIE_LIFETIME = settings.OSCAR_BASKET_COOKIE_LIFETIME
 
 
 class BasketFactory(object):

oscar/apps/customer/history_helpers.py

@@ -6,7 +6,7 @@ from django.conf import settings
 from oscar.core.loading import import_module
 product_signals = import_module('product.signals', ['product_viewed'])
 
-MAX_PRODUCTS = getattr(settings, 'OSCAR_RECENTLY_VIEWED_PRODUCTS', 5)
+MAX_PRODUCTS = settings.OSCAR_RECENTLY_VIEWED_PRODUCTS
 
 # Helpers
 

oscar/apps/promotions/abstract_models.py

@@ -4,8 +4,8 @@ from django.utils.translation import ugettext as _
 from django.core.urlresolvers import reverse
 from django.core.exceptions import ValidationError
 
-BANNER_FOLDER = getattr(settings, 'OSCAR_BANNER_FOLDER', 'images/promotions/banners')
-POD_FOLDER = getattr(settings, 'OSCAR_POD_FOLDER', 'images/promotions/pods')
+BANNER_FOLDER = settings.OSCAR_BANNER_FOLDER
+POD_FOLDER = settings.OSCAR_POD_FOLDER
 
 BANNER, LEFT_POD, RIGHT_POD, RAW_HTML = ('Banner', 'Left pod', 'Right pod', 'Raw HTML')
 POSITION_CHOICES = (

oscar/apps/search/views.py

@@ -18,7 +18,7 @@ class Suggestions(View):
     jQuery autocomplete)
     """
 
-    suggest_limit = getattr(settings, 'OSCAR_SEARCH_SUGGEST_LIMIT', 10)
+    suggest_limit = settings.OSCAR_SEARCH_SUGGEST_LIMIT
 
     def get(self, request):
         context = self.get_context_data()

oscar/defaults.py

@@ -0,0 +1,18 @@
+# Basket settings
+OSCAR_BASKET_COOKIE_LIFETIME = 7*24*60*60
+OSCAR_BASKET_COOKIE_OPEN = 'oscar_open_basket'
+OSCAR_BASKET_COOKIE_SAVED = 'oscar_saved_basket'
+
+# Currency
+OSCAR_DEFAULT_CURRENCY = 'GBP'
+
+# Max number of products to keep on the user's history
+OSCAR_RECENTLY_VIEWED_PRODUCTS = 4
+
+# Image paths
+OSCAR_IMAGE_FOLDER = 'images/products/%Y/%m/'
+OSCAR_BANNER_FOLDER = 'images/promotions/banners'
+OSCAR_POD_FOLDER = 'images/promotions/pods'
+
+# Search settings
+OSCAR_SEARCH_SUGGEST_LIMIT = 10