From 9ee23dabd686ed6008f368d4aee9f4b84dc2780d Mon Sep 17 00:00:00 2001
From: Roberto Rosario <roberto.rosario.gonzalez@gmail.com>
Date: Mon, 10 Sep 2012 22:04:21 -0400
Subject: [PATCH] Fix .settings module name class with django's top settings

---
 apps/storage/backends/filebasedstorage.py | 4 +++-
 apps/storage/backends/gridfsstorage.py    | 4 +++-
 apps/storage/registry.py                  | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/apps/storage/backends/filebasedstorage.py b/apps/storage/backends/filebasedstorage.py
index 160c64dfa4..cbb8ba7319 100644
--- a/apps/storage/backends/filebasedstorage.py
+++ b/apps/storage/backends/filebasedstorage.py
@@ -1,8 +1,10 @@
+from __future__ import absolute_import
+
 import os
 
 from django.core.files.storage import FileSystemStorage
 
-from storage import FILESTORAGE_LOCATION
+from storage.settings import FILESTORAGE_LOCATION
 
 
 class FileBasedStorage(FileSystemStorage):
diff --git a/apps/storage/backends/gridfsstorage.py b/apps/storage/backends/gridfsstorage.py
index bb1c2f74a1..5ce535397c 100644
--- a/apps/storage/backends/gridfsstorage.py
+++ b/apps/storage/backends/gridfsstorage.py
@@ -1,3 +1,5 @@
+from __future__ import absolute_import
+
 import os
 
 from django.core.files.storage import Storage
@@ -6,7 +8,7 @@ from django.utils.encoding import force_unicode
 from pymongo import Connection
 from gridfs import GridFS
 
-from storage.conf import settings
+from storage import settings
 
 
 class GridFSStorage(Storage):
diff --git a/apps/storage/registry.py b/apps/storage/registry.py
index e2c3fdc161..a5fb3723b0 100644
--- a/apps/storage/registry.py
+++ b/apps/storage/registry.py
@@ -3,13 +3,12 @@ from __future__ import absolute_import
 import os
 
 from django.utils.translation import ugettext_lazy as _
-from django.conf import settings
+from django.conf import settings as django_settings
 
 from smart_settings import LocalScope
 
 from .icons import icon_storage
 
-name = 'storage'
 label = _(u'Storage')
 description = _(u'Handles actual storage of files by means of specialized backends.')
 icon = icon_storage
@@ -32,7 +31,7 @@ settings = [
     },
     {
         'name': 'FILESTORAGE_LOCATION',
-        'default': os.path.join(settings.PROJECT_ROOT, u'document_storage'),
+        'default': os.path.join(django_settings.PROJECT_ROOT, u'document_storage'),
         'exists': True,
         'scopes': [LocalScope()]
     },