# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1407841703 -7200
# Node ID d51a6f5e57d1249b700bce598fe51910bd7aba50
# Parent  426427c406ffaf01001262827ce84d34201ad7f5
cleanup: remove unused Python imports, found with pyflakes

diff -r 426427c406ff -r d51a6f5e57d1 docs/conf.py
--- a/docs/conf.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/docs/conf.py	Tue Aug 12 13:08:23 2014 +0200
@@ -13,7 +13,6 @@
 
 import sys
 import os
-import datetime
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/bin/rebranddb.py
--- a/kallithea/bin/rebranddb.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/bin/rebranddb.py	Tue Aug 12 13:08:23 2014 +0200
@@ -18,7 +18,6 @@
 Works on databases from v1.7.2 to v2.2.5
 """
 
-import os
 import sys
 from sqlalchemy import *
 import sqlalchemy.orm
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/config/conf.py
--- a/kallithea/config/conf.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/config/conf.py	Tue Aug 12 13:08:23 2014 +0200
@@ -24,7 +24,6 @@
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
-from kallithea import EXTENSIONS
 
 from kallithea.lib.utils2 import __get_lem
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/admin.py
--- a/kallithea/controllers/admin/admin.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/admin.py	Tue Aug 12 13:08:23 2014 +0200
@@ -35,7 +35,7 @@
 from whoosh import query
 from sqlalchemy.sql.expression import or_, and_, func
 
-from kallithea.model.db import UserLog, User
+from kallithea.model.db import UserLog
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.utils2 import safe_int, remove_prefix, remove_suffix
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/auth_settings.py
--- a/kallithea/controllers/admin/auth_settings.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/auth_settings.py	Tue Aug 12 13:08:23 2014 +0200
@@ -28,14 +28,12 @@
 import formencode.htmlfill
 import traceback
 
-from pylons import request, response, session, tmpl_context as c, url
-from pylons.controllers.util import abort, redirect
+from pylons import request, tmpl_context as c, url
+from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
-from sqlalchemy.exc import DatabaseError
-
 from kallithea.lib import helpers as h
-from kallithea.lib.compat import json, formatted_json
+from kallithea.lib.compat import formatted_json
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator
 from kallithea.lib import auth_modules
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/defaults.py
--- a/kallithea/controllers/admin/defaults.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/defaults.py	Tue Aug 12 13:08:23 2014 +0200
@@ -30,8 +30,8 @@
 import formencode
 from formencode import htmlfill
 
-from pylons import request, session, tmpl_context as c, url
-from pylons.controllers.util import abort, redirect
+from pylons import request, tmpl_context as c, url
+from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from kallithea.lib import helpers as h
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/gists.py
--- a/kallithea/controllers/admin/gists.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/gists.py	Tue Aug 12 13:08:23 2014 +0200
@@ -29,10 +29,9 @@
 import logging
 import traceback
 import formencode
-from formencode import htmlfill
 
 from pylons import request, response, tmpl_context as c, url
-from pylons.controllers.util import abort, redirect
+from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from kallithea.model.forms import GistForm
@@ -43,7 +42,7 @@
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.auth import LoginRequired, NotAnonymous
 from kallithea.lib.utils import jsonify
-from kallithea.lib.utils2 import safe_str, safe_int, time_to_datetime
+from kallithea.lib.utils2 import safe_int, time_to_datetime
 from kallithea.lib.helpers import Page
 from webob.exc import HTTPNotFound, HTTPForbidden
 from sqlalchemy.sql.expression import or_
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/my_account.py
--- a/kallithea/controllers/admin/my_account.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/my_account.py	Tue Aug 12 13:08:23 2014 +0200
@@ -25,12 +25,11 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-import time
 import logging
 import traceback
 import formencode
 
-from sqlalchemy import func, or_
+from sqlalchemy import func
 from formencode import htmlfill
 from pylons import request, tmpl_context as c, url
 from pylons.controllers.util import redirect
@@ -42,7 +41,7 @@
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.utils2 import generate_api_key, safe_int
 from kallithea.lib.compat import json
-from kallithea.model.db import Repository, PullRequest, PullRequestReviewers, \
+from kallithea.model.db import Repository, \
     UserEmailMap, UserApiKeys, User, UserFollowing
 from kallithea.model.forms import UserForm, PasswordChangeForm
 from kallithea.model.user import UserModel
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/notifications.py
--- a/kallithea/controllers/admin/notifications.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/notifications.py	Tue Aug 12 13:08:23 2014 +0200
@@ -29,8 +29,8 @@
 import traceback
 
 from pylons import request
-from pylons import tmpl_context as c, url
-from pylons.controllers.util import redirect, abort
+from pylons import tmpl_context as c
+from pylons.controllers.util import abort
 from webob.exc import HTTPBadRequest
 
 from kallithea.model.db import Notification
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/permissions.py
--- a/kallithea/controllers/admin/permissions.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/permissions.py	Tue Aug 12 13:08:23 2014 +0200
@@ -31,8 +31,8 @@
 import formencode
 from formencode import htmlfill
 
-from pylons import request, session, tmpl_context as c, url
-from pylons.controllers.util import abort, redirect
+from pylons import request, tmpl_context as c, url
+from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from kallithea.lib import helpers as h
@@ -41,7 +41,7 @@
 from kallithea.lib.base import BaseController, render
 from kallithea.model.forms import DefaultPermissionsForm
 from kallithea.model.permission import PermissionModel
-from kallithea.model.db import User, UserIpMap, Permission
+from kallithea.model.db import User, UserIpMap
 from kallithea.model.meta import Session
 
 log = logging.getLogger(__name__)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/repo_groups.py
--- a/kallithea/controllers/admin/repo_groups.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/repo_groups.py	Tue Aug 12 13:08:23 2014 +0200
@@ -36,8 +36,6 @@
 from pylons.controllers.util import abort, redirect
 from pylons.i18n.translation import _, ungettext
 
-from sqlalchemy.exc import IntegrityError
-
 import kallithea
 from kallithea.lib import helpers as h
 from kallithea.lib.compat import json
@@ -52,7 +50,7 @@
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from webob.exc import HTTPInternalServerError, HTTPNotFound
-from kallithea.lib.utils2 import str2bool, safe_int
+from kallithea.lib.utils2 import safe_int
 from sqlalchemy.sql.expression import func
 
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/settings.py
--- a/kallithea/controllers/admin/settings.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/settings.py	Tue Aug 12 13:08:23 2014 +0200
@@ -25,7 +25,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-import time
 import logging
 import traceback
 import formencode
@@ -47,8 +46,7 @@
 from kallithea.model.scm import ScmModel
 from kallithea.model.notification import EmailNotificationModel
 from kallithea.model.meta import Session
-from kallithea.lib.utils2 import str2bool, safe_unicode, safe_str
-from kallithea.lib.compat import json
+from kallithea.lib.utils2 import str2bool, safe_unicode
 log = logging.getLogger(__name__)
 
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/user_groups.py
--- a/kallithea/controllers/admin/user_groups.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/user_groups.py	Tue Aug 12 13:08:23 2014 +0200
@@ -30,8 +30,8 @@
 import formencode
 
 from formencode import htmlfill
-from pylons import request, session, tmpl_context as c, url, config
-from pylons.controllers.util import abort, redirect
+from pylons import request, tmpl_context as c, url, config
+from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
 from sqlalchemy.orm import joinedload
@@ -42,7 +42,7 @@
 from kallithea.lib import helpers as h
 from kallithea.lib.exceptions import UserGroupsAssignedException,\
     RepoGroupAssignmentError
-from kallithea.lib.utils2 import safe_unicode, str2bool, safe_int
+from kallithea.lib.utils2 import safe_unicode, safe_int
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator,\
     HasUserGroupPermissionAnyDecorator, HasPermissionAnyDecorator
 from kallithea.lib.base import BaseController, render
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/admin/users.py
--- a/kallithea/controllers/admin/users.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/admin/users.py	Tue Aug 12 13:08:23 2014 +0200
@@ -28,10 +28,9 @@
 import logging
 import traceback
 import formencode
-from pylons import response
 
 from formencode import htmlfill
-from pylons import request, session, tmpl_context as c, url, config
+from pylons import request, tmpl_context as c, url, config
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 from sqlalchemy.sql.expression import func
@@ -53,7 +52,7 @@
 from kallithea.model.meta import Session
 from kallithea.lib.utils import action_logger
 from kallithea.lib.compat import json
-from kallithea.lib.utils2 import datetime_to_time, str2bool, safe_int
+from kallithea.lib.utils2 import datetime_to_time, safe_int
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/api/__init__.py
--- a/kallithea/controllers/api/__init__.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/api/__init__.py	Tue Aug 12 13:08:23 2014 +0200
@@ -28,7 +28,6 @@
 import inspect
 import logging
 import types
-import urllib
 import traceback
 import time
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/changeset.py
--- a/kallithea/controllers/changeset.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/changeset.py	Tue Aug 12 13:08:23 2014 +0200
@@ -31,7 +31,7 @@
 from collections import defaultdict
 from webob.exc import HTTPForbidden, HTTPBadRequest, HTTPNotFound
 
-from pylons import tmpl_context as c, url, request, response
+from pylons import tmpl_context as c, request, response
 from pylons.i18n.translation import _
 from pylons.controllers.util import redirect
 from kallithea.lib.utils import jsonify
@@ -55,7 +55,7 @@
 from kallithea.lib.diffs import LimitedDiffContainer
 from kallithea.lib.exceptions import StatusChangeOnClosedPullRequestError
 from kallithea.lib.vcs.backends.base import EmptyChangeset
-from kallithea.lib.utils2 import safe_unicode, safe_str
+from kallithea.lib.utils2 import safe_unicode
 from kallithea.lib.graphmod import graph_data
 
 log = logging.getLogger(__name__)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/compare.py
--- a/kallithea/controllers/compare.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/compare.py	Tue Aug 12 13:08:23 2014 +0200
@@ -28,15 +28,13 @@
 
 
 import logging
-import traceback
 import re
 
-from webob.exc import HTTPNotFound, HTTPBadRequest
-from pylons import request, response, session, tmpl_context as c, url
-from pylons.controllers.util import abort, redirect
+from webob.exc import HTTPBadRequest
+from pylons import request, tmpl_context as c, url
+from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
 
-from kallithea.lib.vcs.utils import safe_str
 from kallithea.lib.vcs.utils.hgcompat import unionrepo
 from kallithea.lib import helpers as h
 from kallithea.lib.base import BaseRepoController, render
@@ -44,7 +42,7 @@
 from kallithea.lib import diffs
 from kallithea.model.db import Repository
 from kallithea.lib.diffs import LimitedDiffContainer
-from kallithea.controllers.changeset import anchor_url, _ignorews_url,\
+from kallithea.controllers.changeset import _ignorews_url,\
     _context_url, get_line_ctx, get_ignore_ws
 from kallithea.lib.graphmod import graph_data
 from kallithea.lib.compat import json
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/error.py
--- a/kallithea/controllers/error.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/error.py	Tue Aug 12 13:08:23 2014 +0200
@@ -30,7 +30,7 @@
 import logging
 import paste.fileapp
 
-from pylons import tmpl_context as c, request, config, url
+from pylons import tmpl_context as c, request, config
 from pylons.i18n.translation import _
 from pylons.middleware import  media_path
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/files.py
--- a/kallithea/controllers/files.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/files.py	Tue Aug 12 13:08:23 2014 +0200
@@ -60,7 +60,7 @@
 from kallithea.controllers.changeset import anchor_url, _ignorews_url,\
     _context_url, get_line_ctx, get_ignore_ws
 from webob.exc import HTTPNotFound
-from kallithea.lib.exceptions import NonRelativePathError, IMCCommitError
+from kallithea.lib.exceptions import NonRelativePathError
 
 
 log = logging.getLogger(__name__)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/followers.py
--- a/kallithea/controllers/followers.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/followers.py	Tue Aug 12 13:08:23 2014 +0200
@@ -32,7 +32,7 @@
 from kallithea.lib.helpers import Page
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 from kallithea.lib.base import BaseRepoController, render
-from kallithea.model.db import Repository, User, UserFollowing
+from kallithea.model.db import UserFollowing
 from kallithea.lib.utils2 import safe_int
 
 log = logging.getLogger(__name__)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/forks.py
--- a/kallithea/controllers/forks.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/forks.py	Tue Aug 12 13:08:23 2014 +0200
@@ -33,7 +33,6 @@
 from pylons import tmpl_context as c, request, url
 from pylons.controllers.util import redirect
 from pylons.i18n.translation import _
-from webob.exc import HTTPNotFound, HTTPInternalServerError
 
 import kallithea.lib.helpers as h
 
@@ -47,7 +46,6 @@
 from kallithea.model.forms import RepoForkForm
 from kallithea.model.scm import ScmModel, RepoGroupList
 from kallithea.lib.utils2 import safe_int
-from kallithea.lib.utils import jsonify
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/home.py
--- a/kallithea/controllers/home.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/home.py	Tue Aug 12 13:08:23 2014 +0200
@@ -33,8 +33,6 @@
 from webob.exc import HTTPBadRequest
 from sqlalchemy.sql.expression import func
 
-import kallithea
-from kallithea.lib import helpers as h
 from kallithea.lib.utils import jsonify, conditional_cache
 from kallithea.lib.compat import json
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/pullrequests.py
--- a/kallithea/controllers/pullrequests.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/pullrequests.py	Tue Aug 12 13:08:23 2014 +0200
@@ -31,8 +31,6 @@
 import re
 
 from webob.exc import HTTPNotFound, HTTPForbidden
-from collections import defaultdict
-from itertools import groupby
 
 from pylons import request, tmpl_context as c, url
 from pylons.controllers.util import redirect
@@ -58,7 +56,7 @@
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.forms import PullRequestForm, PullRequestPostForm
 from kallithea.lib.utils2 import safe_int
-from kallithea.controllers.changeset import anchor_url, _ignorews_url,\
+from kallithea.controllers.changeset import _ignorews_url,\
     _context_url, get_line_ctx, get_ignore_ws
 from kallithea.controllers.compare import CompareController
 from kallithea.lib.graphmod import graph_data
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/search.py
--- a/kallithea/controllers/search.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/search.py	Tue Aug 12 13:08:23 2014 +0200
@@ -33,7 +33,7 @@
 
 from whoosh.index import open_dir, EmptyIndexError
 from whoosh.qparser import QueryParser, QueryParserError
-from whoosh.query import Phrase, Wildcard, Term, Prefix
+from whoosh.query import Phrase, Prefix
 from webhelpers.util import update_params
 
 from kallithea.lib.auth import LoginRequired
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/controllers/summary.py
--- a/kallithea/controllers/summary.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/controllers/summary.py	Tue Aug 12 13:08:23 2014 +0200
@@ -28,12 +28,10 @@
 import traceback
 import calendar
 import logging
-import urllib
 from time import mktime
 from datetime import timedelta, date
-from urlparse import urlparse
 
-from pylons import tmpl_context as c, request, url, config
+from pylons import tmpl_context as c, request
 from pylons.i18n.translation import _
 from webob.exc import HTTPBadRequest
 
@@ -45,7 +43,7 @@
 from kallithea.config.conf import ALL_READMES, ALL_EXTS, LANGUAGES_EXTENSIONS_MAP
 from kallithea.model.db import Statistics, CacheInvalidation, User
 from kallithea.lib.utils import jsonify
-from kallithea.lib.utils2 import safe_unicode, safe_str
+from kallithea.lib.utils2 import safe_str
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator,\
     NotAnonymous
 from kallithea.lib.base import BaseRepoController, render
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/auth.py
--- a/kallithea/lib/auth.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/auth.py	Tue Aug 12 13:08:23 2014 +0200
@@ -58,7 +58,6 @@
     get_user_group_slug, conditional_cache
 from kallithea.lib.caching_query import FromCache
 
-from beaker.cache import cache_region
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/auth_modules/__init__.py
--- a/kallithea/lib/auth_modules/__init__.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/auth_modules/__init__.py	Tue Aug 12 13:08:23 2014 +0200
@@ -24,7 +24,7 @@
 from kallithea.lib.compat import formatted_json, hybrid_property
 from kallithea.lib.auth import PasswordGenerator
 from kallithea.model.user import UserModel
-from kallithea.model.db import Setting, User, UserGroup
+from kallithea.model.db import Setting, User
 from kallithea.model.meta import Session
 from kallithea.model.user_group import UserGroupModel
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/base.py
--- a/kallithea/lib/base.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/base.py	Tue Aug 12 13:08:23 2014 +0200
@@ -57,7 +57,6 @@
 from kallithea.model.db import Repository, Ui, User, Setting
 from kallithea.model.notification import NotificationModel
 from kallithea.model.scm import ScmModel
-from kallithea.model.meta import Session
 from kallithea.model.pull_request import PullRequestModel
 
 log = logging.getLogger(__name__)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/celerylib/__init__.py
--- a/kallithea/lib/celerylib/__init__.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/celerylib/__init__.py	Tue Aug 12 13:08:23 2014 +0200
@@ -26,12 +26,10 @@
 """
 
 
-import os
-import sys
 import socket
 import traceback
 import logging
-from os.path import dirname as dn, join as jn
+from os.path import join as jn
 from pylons import config
 
 from hashlib import md5
@@ -43,11 +41,9 @@
 from kallithea.lib.pidlock import DaemonLock, LockHeld
 from kallithea.model import init_model
 from kallithea.model import meta
-from kallithea.model.db import Statistics, Repository, User
 
 from sqlalchemy import engine_from_config
 
-from celery.messaging import establish_connection
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/celerylib/tasks.py
--- a/kallithea/lib/celerylib/tasks.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/celerylib/tasks.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,13 +37,9 @@
 from operator import itemgetter
 from string import lower
 
-from pylons import config, url
-from pylons.i18n.translation import _
+from pylons import config
 
-from kallithea.lib.vcs import get_backend
-
-from kallithea import CELERY_ON, CELERY_EAGER
-from kallithea.lib.utils2 import safe_str
+from kallithea import CELERY_ON
 from kallithea.lib.celerylib import run_task, locked_task, dbsession, \
     str2bool, __get_lockkey, LockHeld, DaemonLock, get_session
 from kallithea.lib.helpers import person
@@ -53,7 +49,6 @@
 from kallithea.lib.hooks import log_create_repository
 
 from kallithea.model.db import Statistics, Repository, User
-from kallithea.model.scm import ScmModel
 
 
 add_cache(config)  # pragma: no cover
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/db_manage.py
--- a/kallithea/lib/db_manage.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/db_manage.py	Tue Aug 12 13:08:23 2014 +0200
@@ -32,7 +32,6 @@
 import uuid
 import logging
 from os.path import dirname as dn, join as jn
-import datetime
 
 from kallithea import __dbversion__, __py_version__, EXTERN_TYPE_INTERNAL, DB_MIGRATIONS
 from kallithea.model.user import UserModel
@@ -48,7 +47,6 @@
 from kallithea.model.meta import Session, Base
 from kallithea.model.repo import RepoModel
 from kallithea.model.permission import PermissionModel
-from kallithea.model.user_group import UserGroupModel
 
 
 log = logging.getLogger(__name__)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/__init__.py
--- a/kallithea/lib/dbmigrate/__init__.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/__init__.py	Tue Aug 12 13:08:23 2014 +0200
@@ -26,8 +26,6 @@
 """
 
 import logging
-from sqlalchemy import engine_from_config
-
 
 from kallithea.lib.utils import BasePasterCommand, Command, add_cache
 from kallithea.lib.db_manage import DbManage
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_1_1_0.py
--- a/kallithea/lib/dbmigrate/schema/db_1_1_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_1_1_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,6 +1,5 @@
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper
+from sqlalchemy.orm import relation, class_mapper
 from sqlalchemy.orm.session import Session
 from kallithea.model.meta import Base
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_1_4_0.py
--- a/kallithea/lib/dbmigrate/schema/db_1_4_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_1_4_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
@@ -50,7 +49,6 @@
 
 from kallithea.lib.utils2 import str2bool, safe_str, get_changeset_safe, \
     safe_unicode, remove_suffix
-from kallithea.lib.compat import json
 from kallithea.lib.caching_query import FromCache
 
 from kallithea.model.meta import Base, Session
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_1_5_0.py
--- a/kallithea/lib/dbmigrate/schema/db_1_5_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_1_5_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -36,7 +36,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
@@ -49,7 +48,6 @@
 
 from kallithea.lib.utils2 import str2bool, safe_str, get_changeset_safe, \
     safe_unicode, remove_suffix, remove_prefix
-from kallithea.lib.compat import json
 from kallithea.lib.caching_query import FromCache
 
 from kallithea.model.meta import Base, Session
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_1_5_2.py
--- a/kallithea/lib/dbmigrate/schema/db_1_5_2.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_1_5_2.py	Tue Aug 12 13:08:23 2014 +0200
@@ -36,7 +36,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_1_6_0.py
--- a/kallithea/lib/dbmigrate/schema/db_1_6_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_1_6_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -36,7 +36,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_1_7_0.py
--- a/kallithea/lib/dbmigrate/schema/db_1_7_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_1_7_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -36,7 +36,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_1_8_0.py
--- a/kallithea/lib/dbmigrate/schema/db_1_8_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_1_8_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -36,7 +36,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_2_0_0.py
--- a/kallithea/lib/dbmigrate/schema/db_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_2_0_1.py
--- a/kallithea/lib/dbmigrate/schema/db_2_0_1.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_2_0_1.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_2_0_2.py
--- a/kallithea/lib/dbmigrate/schema/db_2_0_2.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_2_0_2.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_2_1_0.py
--- a/kallithea/lib/dbmigrate/schema/db_2_1_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_2_1_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_2_2_0.py
--- a/kallithea/lib/dbmigrate/schema/db_2_2_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_2_2_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/schema/db_2_2_3.py
--- a/kallithea/lib/dbmigrate/schema/db_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/schema/db_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/001_initial_release.py
--- a/kallithea/lib/dbmigrate/versions/001_initial_release.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/001_initial_release.py	Tue Aug 12 13:08:23 2014 +0200
@@ -6,7 +6,7 @@
 
 from sqlalchemy import *
 from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper
+from sqlalchemy.orm import relation
 from sqlalchemy.orm.session import Session
 from kallithea.model.meta import Base
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/002_version_1_1_0.py
--- a/kallithea/lib/dbmigrate/versions/002_version_1_1_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/002_version_1_1_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,11 +1,6 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper
-from sqlalchemy.orm.session import Session
-from kallithea.model.meta import Base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/003_version_1_2_0.py
--- a/kallithea/lib/dbmigrate/versions/003_version_1_2_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/003_version_1_2_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -2,14 +2,10 @@
 import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper
-from sqlalchemy.orm.session import Session
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/004_version_1_3_0.py
--- a/kallithea/lib/dbmigrate/versions/004_version_1_3_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/004_version_1_3_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,15 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper
-from sqlalchemy.orm.session import Session
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/005_version_1_3_0.py
--- a/kallithea/lib/dbmigrate/versions/005_version_1_3_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/005_version_1_3_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,15 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper
-from sqlalchemy.orm.session import Session
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/006_version_1_4_0.py
--- a/kallithea/lib/dbmigrate/versions/006_version_1_4_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/006_version_1_4_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -2,16 +2,10 @@
 import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
-from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/007_version_1_4_0.py
--- a/kallithea/lib/dbmigrate/versions/007_version_1_4_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/007_version_1_4_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
-from kallithea.model import meta
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/008_version_1_5_0.py
--- a/kallithea/lib/dbmigrate/versions/008_version_1_5_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/008_version_1_5_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,16 +1,11 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
+from sqlalchemy.orm import joinedload
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/009_version_1_5_1.py
--- a/kallithea/lib/dbmigrate/versions/009_version_1_5_1.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/009_version_1_5_1.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
-from kallithea.model import meta
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/010_version_1_5_2.py
--- a/kallithea/lib/dbmigrate/versions/010_version_1_5_2.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/010_version_1_5_2.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,16 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/011_version_1_6_0.py
--- a/kallithea/lib/dbmigrate/versions/011_version_1_6_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/011_version_1_6_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,16 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/012_version_1_7_0.py
--- a/kallithea/lib/dbmigrate/versions/012_version_1_7_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/012_version_1_7_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,16 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/013_version_1_7_0.py
--- a/kallithea/lib/dbmigrate/versions/013_version_1_7_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/013_version_1_7_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
-from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/014_version_1_7_1.py
--- a/kallithea/lib/dbmigrate/versions/014_version_1_7_1.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/014_version_1_7_1.py	Tue Aug 12 13:08:23 2014 +0200
@@ -2,15 +2,10 @@
 import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/015_version_1_8_0.py
--- a/kallithea/lib/dbmigrate/versions/015_version_1_8_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/015_version_1_8_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,16 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/016_version_2_0_0.py
--- a/kallithea/lib/dbmigrate/versions/016_version_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/016_version_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -2,16 +2,11 @@
 import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea import EXTERN_TYPE_INTERNAL
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/017_version_2_0_0.py
--- a/kallithea/lib/dbmigrate/versions/017_version_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/017_version_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -2,15 +2,10 @@
 import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/018_version_2_0_0.py
--- a/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/018_version_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,11 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/019_version_2_0_0.py
--- a/kallithea/lib/dbmigrate/versions/019_version_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/019_version_2_0_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,19 +1,12 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
-from kallithea.lib.dbmigrate.versions import _reset_base, notify
+from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/020_version_2_0_1.py
--- a/kallithea/lib/dbmigrate/versions/020_version_2_0_1.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/020_version_2_0_1.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,20 +1,13 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea import EXTERN_TYPE_INTERNAL
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
-from kallithea.lib.dbmigrate.versions import _reset_base, notify
+from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/021_version_2_0_2.py
--- a/kallithea/lib/dbmigrate/versions/021_version_2_0_2.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/021_version_2_0_2.py	Tue Aug 12 13:08:23 2014 +0200
@@ -3,16 +3,10 @@
 import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/022_version_2_0_2.py
--- a/kallithea/lib/dbmigrate/versions/022_version_2_0_2.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/022_version_2_0_2.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/023_version_2_1_0.py
--- a/kallithea/lib/dbmigrate/versions/023_version_2_1_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/023_version_2_1_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,19 +1,12 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
-from kallithea.lib.dbmigrate.versions import _reset_base, notify
+from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/024_version_2_1_0.py
--- a/kallithea/lib/dbmigrate/versions/024_version_2_1_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/024_version_2_1_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
@@ -37,7 +30,6 @@
 
 def fixups(models, _SESSION):
     from pylons import config
-    from kallithea.lib.utils2 import str2bool
 
     notify('migrating options from .ini file')
     use_gravatar = str2bool(config.get('use_gravatar'))
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/025_version_2_1_0.py
--- a/kallithea/lib/dbmigrate/versions/025_version_2_1_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/025_version_2_1_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/026_version_2_2_0.py
--- a/kallithea/lib/dbmigrate/versions/026_version_2_2_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/026_version_2_2_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,19 +1,12 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
-from kallithea.lib.dbmigrate.versions import _reset_base, notify
+from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/027_version_2_2_0.py
--- a/kallithea/lib/dbmigrate/versions/027_version_2_2_0.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/027_version_2_2_0.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,19 +1,12 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
-from kallithea.lib.dbmigrate.versions import _reset_base, notify
+from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/028_version_2_2_3.py
--- a/kallithea/lib/dbmigrate/versions/028_version_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/028_version_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,19 +1,12 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
-from kallithea.lib.dbmigrate.versions import _reset_base, notify
+from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/029_version_2_2_3.py
--- a/kallithea/lib/dbmigrate/versions/029_version_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/029_version_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/030_version_2_2_3.py
--- a/kallithea/lib/dbmigrate/versions/030_version_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/030_version_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,19 +1,12 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
-from kallithea.lib.dbmigrate.versions import _reset_base, notify
+from kallithea.lib.dbmigrate.versions import _reset_base
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/031_version_2_2_3.py
--- a/kallithea/lib/dbmigrate/versions/031_version_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/031_version_2_2_3.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,17 +1,10 @@
 import logging
-import datetime
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
-from sqlalchemy.orm.session import Session
-from sqlalchemy.ext.declarative import declarative_base
 
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
-from kallithea.lib.utils2 import str2bool
 
-from kallithea.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/dbmigrate/versions/__init__.py
--- a/kallithea/lib/dbmigrate/versions/__init__.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/dbmigrate/versions/__init__.py	Tue Aug 12 13:08:23 2014 +0200
@@ -26,10 +26,7 @@
 """
 
 from sqlalchemy import *
-from sqlalchemy.exc import DatabaseError
-from sqlalchemy.orm import relation, backref, class_mapper, joinedload
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import scoped_session, sessionmaker
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea.lib.dbmigrate.migrate.changeset import *
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/diffs.py
--- a/kallithea/lib/diffs.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/diffs.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,7 @@
 from kallithea.lib.vcs.nodes import FileNode, SubModuleNode
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.helpers import escape
-from kallithea.lib.utils2 import safe_unicode, safe_str
+from kallithea.lib.utils2 import safe_unicode
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/helpers.py
--- a/kallithea/lib/helpers.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/helpers.py	Tue Aug 12 13:08:23 2014 +0200
@@ -20,14 +20,12 @@
 import random
 import hashlib
 import StringIO
-import urllib
 import math
 import logging
 import re
 import urlparse
 import textwrap
 
-from datetime import datetime
 from pygments.formatters.html import HtmlFormatter
 from pygments import highlight as code_highlight
 from pylons import url
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/indexers/__init__.py
--- a/kallithea/lib/indexers/__init__.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/indexers/__init__.py	Tue Aug 12 13:08:23 2014 +0200
@@ -33,7 +33,7 @@
 # Add location of top level folder to sys.path
 sys.path.append(dn(dn(dn(os.path.realpath(__file__)))))
 
-from whoosh.analysis import RegexTokenizer, LowercaseFilter, StopFilter
+from whoosh.analysis import RegexTokenizer, LowercaseFilter
 from whoosh.fields import TEXT, ID, STORED, NUMERIC, BOOLEAN, Schema, FieldType, DATETIME
 from whoosh.formats import Characters
 from whoosh.highlight import highlight as whoosh_highlight, HtmlFormatter, ContextFragmenter
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/paster_commands/make_index.py
--- a/kallithea/lib/paster_commands/make_index.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/paster_commands/make_index.py	Tue Aug 12 13:08:23 2014 +0200
@@ -34,7 +34,6 @@
 
 from kallithea.lib.utils import BasePasterCommand
 from string import strip
-from shutil import rmtree
 from kallithea.model.repo import RepoModel
 from kallithea.lib.utils import BasePasterCommand, load_rcextensions
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/profiler.py
--- a/kallithea/lib/profiler.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/profiler.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,6 +1,5 @@
 from __future__ import with_statement
 
-import gc
 import objgraph
 import cProfile
 import pstats
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/utils.py
--- a/kallithea/lib/utils.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/utils.py	Tue Aug 12 13:08:23 2014 +0200
@@ -46,9 +46,6 @@
 
 from kallithea import BRAND
 
-from kallithea.lib.vcs import get_backend
-from kallithea.lib.vcs.backends.base import BaseChangeset
-from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.lib.vcs.utils.hgcompat import ui, config
 from kallithea.lib.vcs.utils.helpers import get_scm
 from kallithea.lib.vcs.exceptions import VCSError
@@ -62,7 +59,6 @@
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.lib.utils2 import safe_str, safe_unicode, get_current_authuser
 from kallithea.lib.vcs.utils.fakemod import create_module
-from kallithea.model.user_group import UserGroupModel
 
 log = logging.getLogger(__name__)
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/utils2.py
--- a/kallithea/lib/utils2.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/utils2.py	Tue Aug 12 13:08:23 2014 +0200
@@ -324,7 +324,6 @@
     else:
         import time
         from sqlalchemy import event
-        from sqlalchemy.engine import Engine
 
         log = logging.getLogger('sqlalchemy.engine')
         BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = xrange(30, 38)
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/vcs/backends/git/inmemory.py
--- a/kallithea/lib/vcs/backends/git/inmemory.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/vcs/backends/git/inmemory.py	Tue Aug 12 13:08:23 2014 +0200
@@ -3,7 +3,6 @@
 import posixpath
 import stat
 from dulwich import objects
-from dulwich.repo import Repo
 from kallithea.lib.vcs.backends.base import BaseInMemoryChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError
 from kallithea.lib.vcs.utils import safe_str
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/vcs/backends/hg/repository.py
--- a/kallithea/lib/vcs/backends/hg/repository.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/vcs/backends/hg/repository.py	Tue Aug 12 13:08:23 2014 +0200
@@ -16,9 +16,7 @@
 import logging
 import datetime
 
-
 from kallithea.lib.vcs.backends.base import BaseRepository, CollectionGenerator
-from kallithea.lib.vcs.conf import settings
 
 from kallithea.lib.vcs.exceptions import (
     BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError,
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/vcs/nodes.py
--- a/kallithea/lib/vcs/nodes.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/vcs/nodes.py	Tue Aug 12 13:08:23 2014 +0200
@@ -8,7 +8,7 @@
     :created_on: Apr 8, 2010
     :copyright: (c) 2010-2011 by Marcin Kuzminski, Lukasz Balcerzak.
 """
-import os
+
 import stat
 import posixpath
 import mimetypes
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/vcs/utils/__init__.py
--- a/kallithea/lib/vcs/utils/__init__.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/vcs/utils/__init__.py	Tue Aug 12 13:08:23 2014 +0200
@@ -2,7 +2,7 @@
 This module provides some useful tools for ``vcs`` like annotate/diff html
 output. It also includes some internal helpers.
 """
-import sys
+
 import time
 import datetime
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/lib/verlib.py
--- a/kallithea/lib/verlib.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/lib/verlib.py	Tue Aug 12 13:08:23 2014 +0200
@@ -3,7 +3,6 @@
 discussion at PyCon 2009.
 """
 
-import sys
 import re
 
 class IrrationalVersionError(Exception):
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/model/comment.py
--- a/kallithea/model/comment.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/model/comment.py	Tue Aug 12 13:08:23 2014 +0200
@@ -26,7 +26,6 @@
 """
 
 import logging
-import traceback
 
 from pylons.i18n.translation import _
 from sqlalchemy.util.compat import defaultdict
@@ -34,7 +33,7 @@
 from kallithea.lib.utils2 import extract_mentioned_users, safe_unicode
 from kallithea.lib import helpers as h
 from kallithea.model import BaseModel
-from kallithea.model.db import ChangesetComment, User, Repository, \
+from kallithea.model.db import ChangesetComment, User, \
     Notification, PullRequest
 from kallithea.model.notification import NotificationModel
 from kallithea.model.meta import Session
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/model/db.py
--- a/kallithea/model/db.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/model/db.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from sqlalchemy import *
 from sqlalchemy.ext.hybrid import hybrid_property
 from sqlalchemy.orm import relationship, joinedload, class_mapper, validates
-from sqlalchemy.exc import DatabaseError
 from beaker.cache import cache_region, region_invalidate
 from webob.exc import HTTPNotFound
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/model/gist.py
--- a/kallithea/model/gist.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/model/gist.py	Tue Aug 12 13:08:23 2014 +0200
@@ -32,11 +32,9 @@
 import traceback
 import shutil
 
-from pylons.i18n.translation import _
 from kallithea.lib.utils2 import safe_unicode, unique_id, safe_int, \
     time_to_datetime, safe_str, AttributeDict
 from kallithea.lib.compat import json
-from kallithea.lib import helpers as h
 from kallithea.model import BaseModel
 from kallithea.model.db import Gist
 from kallithea.model.repo import RepoModel
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/model/notification.py
--- a/kallithea/model/notification.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/model/notification.py	Tue Aug 12 13:08:23 2014 +0200
@@ -26,8 +26,6 @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 
-
-import os
 import logging
 import traceback
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/model/repo.py
--- a/kallithea/model/repo.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/model/repo.py	Tue Aug 12 13:08:23 2014 +0200
@@ -39,7 +39,7 @@
 from kallithea.lib.utils2 import LazyProperty, safe_str, safe_unicode, \
     remove_prefix, obfuscate_url_pw, get_current_authuser
 from kallithea.lib.caching_query import FromCache
-from kallithea.lib.hooks import log_create_repository, log_delete_repository
+from kallithea.lib.hooks import log_delete_repository
 
 from kallithea.model import BaseModel
 from kallithea.model.db import Repository, UserRepoToPerm, UserGroupRepoToPerm, \
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/__init__.py
--- a/kallithea/tests/__init__.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/__init__.py	Tue Aug 12 13:08:23 2014 +0200
@@ -42,9 +42,6 @@
 
 from tempfile import _RandomNameSequence
 
-from paste.deploy import loadapp
-from paste.script.appinstall import SetupCommand
-
 import pylons
 import pylons.test
 from pylons import config, url
@@ -57,10 +54,9 @@
 
 from kallithea.lib.compat import unittest
 from kallithea import is_windows
-from kallithea.model.meta import Session
 from kallithea.model.db import User
 from kallithea.tests.nose_parametrized import parameterized
-from kallithea.lib.utils2 import safe_unicode, safe_str
+from kallithea.lib.utils2 import safe_str
 
 
 os.environ['TZ'] = 'UTC'
@@ -140,6 +136,7 @@
 ldap_lib_installed = False
 try:
     import ldap
+    ldap.API_VERSION
     ldap_lib_installed = True
 except ImportError:
     # means that python-ldap is not installed
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/functional/test_admin_gists.py
--- a/kallithea/tests/functional/test_admin_gists.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/functional/test_admin_gists.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,5 +1,3 @@
-import datetime
-
 from kallithea.tests import *
 from kallithea.model.gist import GistModel
 from kallithea.model.meta import Session
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/functional/test_admin_repos.py
--- a/kallithea/tests/functional/test_admin_repos.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/functional/test_admin_repos.py	Tue Aug 12 13:08:23 2014 +0200
@@ -11,7 +11,6 @@
 from kallithea.tests import *
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.repo import RepoModel
-from kallithea.model.scm import ScmModel
 from kallithea.model.meta import Session
 from kallithea.tests.fixture import Fixture, error_function
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/functional/test_admin_settings.py
--- a/kallithea/tests/functional/test_admin_settings.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/functional/test_admin_settings.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,13 +1,8 @@
 # -*- coding: utf-8 -*-
 
-from kallithea.lib.auth import get_crypt_password, check_password
-from kallithea.model.db import User, Setting, Repository, Ui
+from kallithea.model.db import Setting, Ui
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
-from kallithea.lib import helpers as h
-from kallithea.model.user import UserModel
-from kallithea.model.scm import ScmModel
-from kallithea.model.meta import Session
 
 fixture = Fixture()
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/functional/test_changeset_comments.py
--- a/kallithea/tests/functional/test_changeset_comments.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/functional/test_changeset_comments.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,5 +1,5 @@
 from kallithea.tests import *
-from kallithea.model.db import ChangesetComment, Notification, User, \
+from kallithea.model.db import ChangesetComment, Notification, \
     UserNotification
 from kallithea.model.meta import Session
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/functional/test_home.py
--- a/kallithea/tests/functional/test_home.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/functional/test_home.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,8 +1,7 @@
-import time
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 from kallithea.model.meta import Session
-from kallithea.model.db import User, Repository
+from kallithea.model.db import Repository
 from kallithea.model.repo import RepoModel
 from kallithea.model.repo_group import RepoGroupModel
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/functional/test_journal.py
--- a/kallithea/tests/functional/test_journal.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/functional/test_journal.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,6 +1,4 @@
 from kallithea.tests import *
-from kallithea.model.db import UserFollowing, User, Repository
-from kallithea.lib.helpers import get_token
 import datetime
 
 
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/models/test_user_groups.py
--- a/kallithea/tests/models/test_user_groups.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/models/test_user_groups.py	Tue Aug 12 13:08:23 2014 +0200
@@ -1,5 +1,3 @@
-import os
-from sqlalchemy.exc import IntegrityError
 from kallithea.model.db import User
 
 from kallithea.tests import *
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/models/test_user_permissions_on_repo_groups.py
--- a/kallithea/tests/models/test_user_permissions_on_repo_groups.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/models/test_user_permissions_on_repo_groups.py	Tue Aug 12 13:08:23 2014 +0200
@@ -2,7 +2,7 @@
 from kallithea.tests import *
 
 from kallithea.model.repo_group import RepoGroupModel
-from kallithea.model.db import RepoGroup, Repository, User
+from kallithea.model.db import RepoGroup, User
 
 from kallithea.model.meta import Session
 from nose.tools import with_setup
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/scripts/test_concurency.py
--- a/kallithea/tests/scripts/test_concurency.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/scripts/test_concurency.py	Tue Aug 12 13:08:23 2014 +0200
@@ -37,7 +37,6 @@
 from subprocess import Popen, PIPE
 
 from paste.deploy import appconfig
-from pylons import config
 from sqlalchemy import engine_from_config
 
 from kallithea.lib.utils import add_cache
@@ -46,7 +45,7 @@
 from kallithea.model.db import User, Repository
 from kallithea.lib.auth import get_crypt_password
 
-from kallithea.tests import TESTS_TMP_PATH, NEW_HG_REPO, HG_REPO
+from kallithea.tests import TESTS_TMP_PATH, HG_REPO
 from kallithea.config.environment import load_environment
 
 rel_path = dn(dn(dn(dn(os.path.abspath(__file__)))))
diff -r 426427c406ff -r d51a6f5e57d1 kallithea/tests/vcs/test_hg.py
--- a/kallithea/tests/vcs/test_hg.py	Tue Aug 12 13:08:23 2014 +0200
+++ b/kallithea/tests/vcs/test_hg.py	Tue Aug 12 13:08:23 2014 +0200
@@ -4,7 +4,7 @@
 from kallithea.lib.vcs.backends.hg import MercurialRepository, MercurialChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError, VCSError, NodeDoesNotExistError
 from kallithea.lib.vcs.nodes import NodeKind, NodeState
-from kallithea.tests.vcs.conf import PACKAGE_DIR, TEST_HG_REPO, TEST_HG_REPO_CLONE, \
+from kallithea.tests.vcs.conf import TEST_HG_REPO, TEST_HG_REPO_CLONE, \
     TEST_HG_REPO_PULL
 from kallithea.lib.vcs.utils.compat import unittest