X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/b9055c7fc8caed025fd28c12532bd462edb8c78d..478690d49accdde903481207c38fbbe2e93b447e:/redakcja/settings/__init__.py?ds=sidebyside

diff --git a/redakcja/settings/__init__.py b/redakcja/settings/__init__.py
index e6ee2038..6f1c094e 100644
--- a/redakcja/settings/__init__.py
+++ b/redakcja/settings/__init__.py
@@ -1,5 +1,5 @@
 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.
@@ -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.
 
-try:
-    from localsettings import *
-except ImportError:
-    pass
-
 try:
     LOGGING_CONFIG_FILE
 except NameError:
@@ -27,6 +22,6 @@ try:
     else:
         import sys
         logging.basicConfig(stream=sys.stderr)
-except ImportError as exc:
+except (ImportError,), exc:
     raise