# HG changeset patch
# User Mads Kiilerich <mads@kiilerich.com>
# Date 2017-04-13 02:25:59
# Node ID c184df63e47046b549077a99e23adf5d7a564999
# Parent  0452c45a546cdac2de58ef30135b8e25327ec63c

lib: reduce impact of bad import cycle

Follow-up to e0f31c7d0f5e.

It is unfortunate that generic lib code depends on
kallithea.lib.paster_commands.common - it would make more sense if it was the
other way around. We thus move the import down to inside the function that
needs it.

The import of kallithea.lib.paster_commands.common in db_manage triggered its
import of logging.config . middleware.py thus also got logging.config when it
just imported logging and things worked. Without this import of
paster_commands, we also have to fix the import in db_manage.

diff --git a/kallithea/config/middleware.py b/kallithea/config/middleware.py
--- a/kallithea/config/middleware.py
+++ b/kallithea/config/middleware.py
@@ -13,7 +13,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 """WSGI middleware initialization for the Kallithea application."""
 
-import logging
+import logging.config
 from kallithea.config.app_cfg import base_config
 from kallithea.config.environment import load_environment
 
diff --git a/kallithea/lib/db_manage.py b/kallithea/lib/db_manage.py
--- a/kallithea/lib/db_manage.py
+++ b/kallithea/lib/db_manage.py
@@ -36,7 +36,6 @@ from os.path import dirname
 import alembic.config
 import alembic.command
 
-from kallithea.lib.paster_commands.common import ask_ok
 from kallithea.model.user import UserModel
 from kallithea.model.base import init_model
 from kallithea.model.db import User, Permission, Ui, \
@@ -78,6 +77,7 @@ class DbManage(object):
         force_ask = self.cli_args.get('force_ask')
         if force_ask is not None:
             return force_ask
+        from kallithea.lib.paster_commands.common import ask_ok
         return ask_ok(msg)
 
     def init_db(self, SESSION=None):