Include location helper in docs, and use it more in settings

Two people on the mailing list tripped over the location helper, so it's
now included right next to where it is used.

The helper is now also used in a few more spots in the settings.

docs/source/internals/getting_started.rst

@@ -147,7 +147,12 @@ Modify your ``TEMPLATE_DIRS`` to include the main Oscar template directory:
 
 .. code-block:: django
 
+    import os
     from oscar import OSCAR_MAIN_TEMPLATE_DIR
+
+    location = lambda x: os.path.join(
+        os.path.dirname(os.path.realpath(__file__)), x)
+
     TEMPLATE_DIRS = (
         location('templates'),
         OSCAR_MAIN_TEMPLATE_DIR,

sites/demo/settings.py

@@ -12,7 +12,6 @@ Notes:
 import os
 
 # Django settings for oscar project.
-PROJECT_DIR = os.path.dirname(__file__)
 location = lambda x: os.path.join(
     os.path.dirname(os.path.realpath(__file__)), x)
 

sites/sandbox/settings.py

@@ -1,8 +1,6 @@
 import os
-import sys
 
 # Path helper
-PROJECT_DIR = os.path.dirname(__file__)
 location = lambda x: os.path.join(
     os.path.dirname(os.path.realpath(__file__)), x)
 
@@ -28,7 +26,7 @@ MANAGERS = ADMINS
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(os.path.dirname(__file__), 'db.sqlite'),
+        'NAME': location('db.sqlite'),
         'USER': '',
         'PASSWORD': '',
         'HOST': '',
@@ -327,7 +325,7 @@ APPEND_SLASH = True
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
-        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
+        'PATH': location('whoosh_index'),
     },
 }
 

sites/us/settings.py

@@ -1,7 +1,6 @@
 import os
 
 # Path helper
-PROJECT_DIR = os.path.dirname(__file__)
 location = lambda x: os.path.join(
     os.path.dirname(os.path.realpath(__file__)), x)
 
@@ -21,7 +20,7 @@ MANAGERS = ADMINS
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(os.path.dirname(__file__), 'db.sqlite'),
+        'NAME': location('db.sqlite'),
         'USER': '',
         'PASSWORD': '',
         'HOST': '',
@@ -303,7 +302,7 @@ APPEND_SLASH = True
 HAYSTACK_CONNECTIONS = {
     'default': {
         'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
-        'PATH': os.path.join(os.path.dirname(__file__), 'whoosh_index'),
+        'PATH': location('whoosh_index'),
     },
 }