# HG changeset patch # User Marcin Kuzminski # Date 2017-11-10 15:09:36 # Node ID 8478dd3141615bdf98f0f734bb81e4ef3fa21c34 # Parent 31bf5a7bd4d39bbfcbb69b1ba780cc5c4a101ddb db: ported init_model to pyramid. diff --git a/rhodecode/model/__init__.py b/rhodecode/model/__init__.py --- a/rhodecode/model/__init__.py +++ b/rhodecode/model/__init__.py @@ -62,8 +62,9 @@ def init_model(engine, encryption_key=No db.ENCRYPTION_KEY = encryption_key -def init_model_encryption(migration_models): - from pylons import config +def init_model_encryption(migration_models, config=None): + from pyramid.threadlocal import get_current_registry + config = config or get_current_registry().settings migration_models.ENCRYPTION_KEY = get_encryption_key(config) db.ENCRYPTION_KEY = get_encryption_key(config)