Update python2 to python3

[modeling/etsicatalog.git] / genericparser / settings.py

diff --git a/genericparser/settings.py b/genericparser/settings.py
index a3310b9..6044c13 100644 (file)
--- a/genericparser/settings.py
+++ b/genericparser/settings.py
@@ -16,13 +16,14 @@ import os
 import sys
 import platform
 
-import redisco
+import genericparser.pub.redisco
 
 from genericparser.pub.config.config import REDIS_HOST, REDIS_PORT, REDIS_PASSWD
 from genericparser.pub.config.config import DB_NAME, DB_IP, DB_USER, DB_PASSWD, DB_PORT
 from genericparser.pub.config import config as pub_config
 from logging import config as log_config
 from onaplogging import monkey
+
 monkey.patch_all()
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
@@ -47,6 +48,7 @@ INSTALLED_APPS = [
     'django.contrib.sessions',
     'django.contrib.messages',
     'django.contrib.staticfiles',
+    'django.contrib.admin',
     'rest_framework',
     'genericparser.pub.database',
     'genericparser.samples',
@@ -86,7 +88,7 @@ MIDDLEWARE_CLASSES = [
     'django.contrib.auth.middleware.SessionAuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
-       'genericparser.middleware.LogContextMiddleware',
+    'genericparser.middleware.LogContextMiddleware',
 ]
 
 ROOT_URLCONF = 'genericparser.urls'
@@ -115,7 +117,7 @@ DATABASES = {
     },
 }
 
-redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
+genericparser.pub.redisco.connection_setup(host=REDIS_HOST, port=REDIS_PORT, password=REDIS_PASSWD, db=0)
 # CACHE_BACKEND = 'redis_cache.cache://%s@%s:%s' % (REDIS_PASSWD, REDIS_HOST, REDIS_PORT)
 
 TIME_ZONE = 'UTC'
@@ -163,6 +165,11 @@ if platform.system() == 'Windows' or 'test' in sys.argv:
                 'level': 'DEBUG',
                 'propagate': False
             },
+            'tosca': {
+                'handlers': ['genericparser_handler'],
+                'level': 'DEBUG',
+                'propagate': False
+            },
         }
     }
 else:
@@ -189,5 +196,6 @@ if 'test' in sys.argv:
 
     import mock
     from genericparser.pub.utils import idutil
+
     idutil.get_auto_id = mock.Mock()
     idutil.get_auto_id.return_value = 1