reset + solutions

[redakcja.git] / redakcja / settings / __init__.py

diff --git a/redakcja/settings/__init__.py b/redakcja/settings/__init__.py
index e6ee203..4d4fe8f 100644 (file)
--- a/redakcja/settings/__init__.py
+++ b/redakcja/settings/__init__.py
@@ -1,17 +1,17 @@
 from __future__ import absolute_import
 from __future__ import absolute_import

-from .common import *
+from os import path
+from redakcja.settings.common import *

 
 

-DATABASE_ENGINE = 'sqlite3'    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
-DATABASE_NAME = PROJECT_ROOT + '/dev.sqlite'             # Or path to database file if using sqlite3.
-DATABASE_USER = ''             # Not used with sqlite3.
-DATABASE_PASSWORD = ''         # Not used with sqlite3.
-DATABASE_HOST = ''             # Set to empty string for localhost. Not used with sqlite3.
-DATABASE_PORT = ''             # Set to empty string for default. Not used with sqlite3.
-
-try:
-    from localsettings import *
-except ImportError:
-    pass
+DATABASES = {
+    'default': {
+        'ENGINE': 'django.db.backends.sqlite3', # Add 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
+        'NAME': path.join(PROJECT_ROOT, 'dev.sqlite'), # Or path to database file if using sqlite3.
+        'USER': '',                      # Not used with sqlite3.
+        'PASSWORD': '',                  # Not used with sqlite3.
+        'HOST': '',                      # Set to empty string for localhost. Not used with sqlite3.
+        'PORT': '',                      # Set to empty string for default. Not used with sqlite3.
+    }
+}

 
 try:
     LOGGING_CONFIG_FILE
 
 try:
     LOGGING_CONFIG_FILE


@@ -27,6 +27,11 @@ try:
     else:
         import sys
         logging.basicConfig(stream=sys.stderr)
     else:
         import sys
         logging.basicConfig(stream=sys.stderr)

-except ImportError as exc:
+except (ImportError,), exc:

     raise
 
     raise
 

+
+try:
+    from redakcja.localsettings import *
+except ImportError:
+    pass