X-Git-Url: https://git.mdrn.pl/redakcja.git/blobdiff_plain/3cff6e4a3f7e7acceacbc621f9196204b508121e..a7a2b1c6daaa2266645abc5ee4fac91ce10a4c39:/redakcja/settings/__init__.py?ds=sidebyside diff --git a/redakcja/settings/__init__.py b/redakcja/settings/__init__.py index 8be901ad..6f1c094e 100644 --- a/redakcja/settings/__init__.py +++ b/redakcja/settings/__init__.py @@ -1,5 +1,5 @@ from __future__ import absolute_import -from settings.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: