fix

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

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

-from .common import *
+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_ENGINE = 'sqlite3'    # 'postgresql_psycopg2', 'postgresql', 'mysql', 'sqlite3' or 'oracle'.
 DATABASE_NAME = PROJECT_ROOT + '/dev.sqlite'             # Or path to database file if using sqlite3.


@@ -8,11 +8,6 @@ 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.
 
 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
-

 try:
     LOGGING_CONFIG_FILE
 except NameError:
 try:
     LOGGING_CONFIG_FILE
 except NameError:


@@ -27,6 +22,6 @@ 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