kallithea Changeset - d51a6f5e57d1

@@ @@ -10,13 +10,12 @@ @@
+#
 # All configuration values have a default; values that are commented out
 # serve to show the default.
 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
 # documentation root, use os.path.abspath to make it absolute, like shown here.
 sys.path.insert(0, os.path.abspath('..'))

kallithea/bin/rebranddb.py

➞

Show inline comments

@@ @@ -15,13 +15,12 @@ @@
 """
 Script for rebranding of database to and from what Kallithea expects
 Works on databases from v1.7.2 to v2.2.5
 """
 import os
 import sys
 from sqlalchemy import *
 import sqlalchemy.orm
 import sqlalchemy.ext.declarative
 import migrate.changeset # a part of sqlalchemy-migrate which is available on pypi

kallithea/config/conf.py

➞

Show inline comments

@@ @@ -21,13 +21,12 @@ This file was forked by the Kallithea pr @@
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Mar 7, 2012
 :author: marcink
 :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
 # language map is also used by whoosh indexer, which for those specified
 # extensions will index it's content

kallithea/controllers/admin/admin.py

➞

Show inline comments

@@ @@ -32,13 +32,13 @@ from pylons import request, tmpl_context @@
 from sqlalchemy.orm import joinedload
 from whoosh.qparser.default import QueryParser
 from whoosh.qparser.dateparse import DateParserPlugin
 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
 from kallithea.lib.indexers import JOURNAL_SCHEMA
 from kallithea.lib.helpers import Page

kallithea/controllers/admin/auth_settings.py

➞

Show inline comments

@@ @@ -25,20 +25,18 @@ Original author and date, and relevant c @@
 import pprint
 import logging
 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
 from kallithea.model.forms import AuthSettingsForm
 from kallithea.model.db import Setting
 from kallithea.model.meta import Session

kallithea/controllers/admin/defaults.py

➞

Show inline comments

@@ @@ -27,14 +27,14 @@ Original author and date, and relevant c @@
 import logging
 import traceback
 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
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator
 from kallithea.lib.base import BaseController, render
 from kallithea.model.forms import DefaultsForm

kallithea/controllers/admin/gists.py

➞

Show inline comments

@@ @@ -26,27 +26,26 @@ Original author and date, and relevant c @@
 """
 import time
 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
 from kallithea.model.gist import GistModel
 from kallithea.model.meta import Session
 from kallithea.model.db import Gist, User
 from kallithea.lib import helpers as h
 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_
 from kallithea.lib.vcs.exceptions import VCSError, NodeNotChangedError
 log = logging.getLogger(__name__)

kallithea/controllers/admin/my_account.py

➞

Show inline comments

@@ @@ -22,30 +22,29 @@ Original author and date, and relevant c @@
 :created_on: August 20, 2013
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :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
 from pylons.i18n.translation import _
 from kallithea import EXTERN_TYPE_INTERNAL
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import LoginRequired, NotAnonymous, AuthUser
 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
 from kallithea.model.repo import RepoModel
 from kallithea.model.api_key import ApiKeyModel
 from kallithea.model.meta import Session

kallithea/controllers/admin/notifications.py

➞

Show inline comments

@@ @@ -26,14 +26,14 @@ Original author and date, and relevant c @@
 """
 import logging
 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
 from kallithea.model.notification import NotificationModel
 from kallithea.model.meta import Session
 from kallithea.lib.auth import LoginRequired, NotAnonymous

kallithea/controllers/admin/permissions.py

➞

Show inline comments

@@ @@ -28,23 +28,23 @@ Original author and date, and relevant c @@
 import logging
 import traceback
 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
 from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator,\
     AuthUser
 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__)
 class PermissionsController(BaseController):

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -33,14 +33,12 @@ import itertools @@
 from formencode import htmlfill
 from pylons import request, tmpl_context as c, url
 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
 from kallithea.lib.auth import LoginRequired, HasPermissionAnyDecorator,\
     HasRepoGroupPermissionAnyDecorator, HasRepoGroupPermissionAll,\
     HasPermissionAll
@@ @@ -49,13 +47,13 @@ from kallithea.model.db import RepoGroup @@
 from kallithea.model.scm import RepoGroupList
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.forms import RepoGroupForm, RepoGroupPermsForm
 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
 log = logging.getLogger(__name__)

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -22,13 +22,12 @@ Original author and date, and relevant c @@
 :created_on: Jul 14, 2010
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import time
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
 from pylons import request, tmpl_context as c, url, config
@@ @@ -44,14 +43,13 @@ from kallithea.lib.utils import repo2db_ @@
 from kallithea.model.db import Ui, Repository, Setting
 from kallithea.model.forms import ApplicationSettingsForm, \
     ApplicationUiSettingsForm, ApplicationVisualisationForm
 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__)
 class SettingsController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""
     # To properly map this controller, ensure your config/routing.py

kallithea/controllers/admin/user_groups.py

➞

Show inline comments

@@ @@ -27,25 +27,25 @@ Original author and date, and relevant c @@
 import logging
 import traceback
 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
 from sqlalchemy.sql.expression import func
 from webob.exc import HTTPInternalServerError
 import kallithea
 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
 from kallithea.model.scm import UserGroupList
 from kallithea.model.user_group import UserGroupModel
 from kallithea.model.repo import RepoModel

kallithea/controllers/admin/users.py

➞

Show inline comments

@@ @@ -25,16 +25,15 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 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
 import kallithea
 from kallithea.lib.exceptions import DefaultUserException, \
@@ @@ -50,13 +49,13 @@ from kallithea.model.api_key import ApiK @@
 from kallithea.model.db import User, UserEmailMap, UserIpMap, UserToPerm
 from kallithea.model.forms import UserForm, CustomDefaultPermissionsForm
 from kallithea.model.user import UserModel
 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__)
 class UsersController(BaseController):
     """REST Controller styled on the Atom Publishing Protocol"""

kallithea/controllers/api/__init__.py

➞

Show inline comments

@@ @@ -25,13 +25,12 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import inspect
 import logging
 import types
 import urllib
 import traceback
 import time
 from paste.response import replace_header
 from pylons.controllers import WSGIController

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -28,13 +28,13 @@ Original author and date, and relevant c @@
 import logging
 import traceback
 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
 from kallithea.lib.vcs.exceptions import RepositoryError, \
     ChangesetDoesNotExistError
@@ @@ -52,13 +52,13 @@ from kallithea.model.comment import Chan @@
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 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__)
 def _update_with_GET(params, GET):

kallithea/controllers/compare.py

➞

Show inline comments

@@ @@ -25,29 +25,27 @@ Original author and date, and relevant c @@
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 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
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
 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
 log = logging.getLogger(__name__)

kallithea/controllers/error.py

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ Original author and date, and relevant c @@
 import os
 import cgi
 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
 from kallithea.lib.base import BaseController, render
 log = logging.getLogger(__name__)

kallithea/controllers/files.py

➞

Show inline comments

@@ @@ -57,13 +57,13 @@ from kallithea.model.repo import RepoMod @@
 from kallithea.model.scm import ScmModel
 from kallithea.model.db import Repository
 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__)
 class FilesController(BaseRepoController):

kallithea/controllers/followers.py

➞

Show inline comments

@@ @@ -29,13 +29,13 @@ import logging @@
 from pylons import tmpl_context as c, request
 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__)
 class FollowersController(BaseRepoController):

kallithea/controllers/forks.py

➞

Show inline comments

@@ @@ -30,13 +30,12 @@ import formencode @@
 import traceback
 from formencode import htmlfill
 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
 from kallithea.lib.helpers import Page
 from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \
     NotAnonymous, HasRepoPermissionAny, HasPermissionAnyDecorator
@@ @@ -44,13 +43,12 @@ from kallithea.lib.base import BaseRepoC @@
 from kallithea.model.db import Repository, RepoGroup, UserFollowing, User,\
     Ui
 from kallithea.model.repo import RepoModel
 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__)
 class ForksController(BaseRepoController):

kallithea/controllers/home.py

➞

Show inline comments

@@ @@ -30,14 +30,12 @@ import logging @@
 from pylons import tmpl_context as c, request
 from pylons.i18n.translation import _
 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
 from kallithea.lib.base import BaseController, render
 from kallithea.model.db import Repository, RepoGroup
 from kallithea.model.repo import RepoModel

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -28,14 +28,12 @@ Original author and date, and relevant c @@
 import logging
 import traceback
 import formencode
 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
 from pylons.i18n.translation import _
 from kallithea.lib.compat import json
@@ @@ -55,13 +53,13 @@ from kallithea.model.pull_request import @@
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.comment import ChangesetCommentsModel
 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
 log = logging.getLogger(__name__)

kallithea/controllers/search.py

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ import traceback @@
 import urllib
 from pylons.i18n.translation import _
 from pylons import request, config, tmpl_context as c
 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
 from kallithea.lib.base import BaseRepoController, render
 from kallithea.lib.indexers import CHGSETS_SCHEMA, SCHEMA, CHGSET_IDX_NAME, \
     IDX_NAME, WhooshResultWrapper

kallithea/controllers/summary.py

➞

Show inline comments

@@ @@ -25,30 +25,28 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 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
 from beaker.cache import cache_region, region_invalidate
 from kallithea.lib.compat import product
 from kallithea.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, \
     NodeDoesNotExistError
 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
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.markup_renderer import MarkupRenderer
 from kallithea.lib.celerylib import run_task

kallithea/lib/auth.py

➞

Show inline comments

@@ @@ -55,13 +55,12 @@ from kallithea.model.db import User, Rep @@
 from kallithea.lib.utils2 import safe_unicode, aslist
 from kallithea.lib.utils import get_repo_slug, get_repo_group_slug, \
     get_user_group_slug, conditional_cache
 from kallithea.lib.caching_query import FromCache
 from beaker.cache import cache_region
 log = logging.getLogger(__name__)
 class PasswordGenerator(object):
     """

kallithea/lib/auth_modules/__init__.py

➞

Show inline comments

@@ @@ -21,13 +21,13 @@ import traceback @@
 from kallithea import EXTERN_TYPE_INTERNAL
 from kallithea.lib.compat import importlib
 from kallithea.lib.utils2 import str2bool
 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
 log = logging.getLogger(__name__)

kallithea/lib/base.py

➞

Show inline comments

@@ @@ -54,13 +54,12 @@ from kallithea.lib.exceptions import Use @@
 from kallithea.lib.vcs.exceptions import RepositoryError, EmptyRepositoryError, ChangesetDoesNotExistError
 from kallithea.model import meta
 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__)
 def _filter_proxy(ip):

kallithea/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -23,34 +23,30 @@ Original author and date, and relevant c @@
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 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
 from decorator import decorator
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea import CELERY_ON, CELERY_EAGER
 from kallithea.lib.utils2 import str2bool, safe_str
 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__)
 class ResultWrapper(object):
     def __init__(self, task):

kallithea/lib/celerylib/tasks.py

➞

Show inline comments

@@ @@ -34,29 +34,24 @@ import logging @@
 from os.path import join as jn
 from time import mktime
 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
 from kallithea.lib.rcmail.smtp_mailer import SmtpMailer
 from kallithea.lib.utils import add_cache, action_logger
 from kallithea.lib.compat import json, OrderedDict
 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
 __all__ = ['whoosh_index', 'get_commits_stats',
            'reset_user_password', 'send_email']

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -29,13 +29,12 @@ Original author and date, and relevant c @@
 import os
 import sys
 import time
 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
 from kallithea.lib.utils import ask_ok
 from kallithea.model import init_model
 from kallithea.model.db import User, Permission, Ui, \
@@ @@ -45,13 +44,12 @@ from kallithea.model.db import User, Per @@
 from sqlalchemy.engine import create_engine
 from kallithea.model.repo_group import RepoGroupModel
 #from kallithea.model import meta
 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__)
 def notify(msg):

kallithea/lib/dbmigrate/__init__.py

➞

Show inline comments

@@ @@ -23,14 +23,12 @@ Original author and date, and relevant c @@
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 from sqlalchemy import engine_from_config
 from kallithea.lib.utils import BasePasterCommand, Command, add_cache
 from kallithea.lib.db_manage import DbManage
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/schema/db_1_1_0.py

➞

Show inline comments

 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
 class BaseModel(object):
     """Base Model for all classess

kallithea/lib/dbmigrate/schema/db_1_4_0.py

➞

Show inline comments

@@ @@ -34,26 +34,24 @@ import hashlib @@
 import time
 from collections import defaultdict
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend
 from kallithea.lib.vcs.utils.helpers import get_scm
 from kallithea.lib.vcs.exceptions import VCSError
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 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
 from kallithea import DB_PREFIX

kallithea/lib/dbmigrate/schema/db_1_5_0.py

➞

Show inline comments

@@ @@ -33,26 +33,24 @@ import hashlib @@
 import time
 from collections import defaultdict
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend
 from kallithea.lib.vcs.utils.helpers import get_scm
 from kallithea.lib.vcs.exceptions import VCSError
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 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
 from kallithea import DB_PREFIX

kallithea/lib/dbmigrate/schema/db_1_5_2.py

➞

Show inline comments

@@ @@ -33,13 +33,12 @@ import hashlib @@
 import time
 from collections import defaultdict
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_1_6_0.py

➞

Show inline comments

@@ @@ -33,13 +33,12 @@ import hashlib @@
 import time
 from collections import defaultdict
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_1_7_0.py

➞

Show inline comments

@@ @@ -33,13 +33,12 @@ import traceback @@
 import hashlib
 import collections
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_1_8_0.py

➞

Show inline comments

@@ @@ -33,13 +33,12 @@ import traceback @@
 import hashlib
 import collections
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_2_0_0.py

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ import hashlib @@
 import collections
 import functools
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_2_0_1.py

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ import hashlib @@
 import collections
 import functools
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_2_0_2.py

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ import hashlib @@
 import collections
 import functools
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_2_1_0.py

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ import hashlib @@
 import collections
 import functools
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_2_2_0.py

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ import hashlib @@
 import collections
 import functools
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/schema/db_2_2_3.py

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ import hashlib @@
 import collections
 import functools
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea.lib.vcs import get_backend

kallithea/lib/dbmigrate/versions/001_initial_release.py

➞

Show inline comments

@@ @@ -3,13 +3,13 @@ @@
 #==============================================================================
 import logging
 import datetime
 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
 from kallithea.lib.dbmigrate.migrate import *
 from kallithea import DB_PREFIX

kallithea/lib/dbmigrate/versions/002_version_1_1_0.py

➞

Show inline comments

 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 *
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/003_version_1_2_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """ Upgrade operations go here.

kallithea/lib/dbmigrate/versions/004_version_1_3_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """ Upgrade operations go here.

kallithea/lib/dbmigrate/versions/005_version_1_3_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """ Upgrade operations go here.

kallithea/lib/dbmigrate/versions/006_version_1_4_0.py

➞

Show inline comments

 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
 from kallithea.lib.dbmigrate.versions import _reset_base
 log = logging.getLogger(__name__)
 def upgrade(migrate_engine):

kallithea/lib/dbmigrate/versions/007_version_1_4_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/008_version_1_5_0.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/009_version_1_5_1.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/010_version_1_5_2.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/011_version_1_6_0.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/012_version_1_7_0.py

➞

Show inline comments

 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__)

kallithea/lib/dbmigrate/versions/013_version_1_7_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):

kallithea/lib/dbmigrate/versions/014_version_1_7_1.py

➞

Show inline comments

 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__)

kallithea/lib/dbmigrate/versions/015_version_1_8_0.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/016_version_2_0_0.py

➞

Show inline comments

 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.model.meta import Base
 from kallithea.model import meta
 from kallithea.lib.dbmigrate.versions import _reset_base, notify
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/017_version_2_0_0.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/018_version_2_0_0.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/019_version_2_0_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/020_version_2_0_1.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/021_version_2_0_2.py

➞

Show inline comments

 import os
 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/022_version_2_0_2.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/023_version_2_1_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/024_version_2_1_0.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)
@@ @@ -34,13 +27,12 @@ def downgrade(migrate_engine): @@
     meta = MetaData()
     meta.bind = migrate_engine
 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'))
     print('Setting gravatar use to: %s' % use_gravatar)
     sett = models.Setting.create_or_update('use_gravatar',
                                                     use_gravatar, 'bool')

kallithea/lib/dbmigrate/versions/025_version_2_1_0.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/026_version_2_2_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/027_version_2_2_0.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/028_version_2_2_3.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/029_version_2_2_3.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/030_version_2_2_3.py

➞

Show inline comments

 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__)
 def upgrade(migrate_engine):
     """

kallithea/lib/dbmigrate/versions/031_version_2_2_3.py

➞

Show inline comments

 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
 log = logging.getLogger(__name__)

kallithea/lib/dbmigrate/versions/__init__.py

➞

Show inline comments

@@ @@ -23,16 +23,13 @@ Original author and date, and relevant c @@
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 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 *
 from kallithea.model import meta

kallithea/lib/diffs.py

➞

Show inline comments

@@ @@ -34,13 +34,13 @@ from itertools import tee, imap @@
 from pylons.i18n.translation import _
 from kallithea.lib.vcs.exceptions import VCSError
 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__)
 def wrap_to_table(str_):
     return '''<table class="code-difftable">

kallithea/lib/helpers.py

➞

Show inline comments

@@ @@ -17,20 +17,18 @@ Helper functions @@
 Consists of functions to typically be used within templates, but also
 available to Controllers. This module is available to both as 'h'.
 """
 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
 from pylons.i18n.translation import _, ungettext
 from hashlib import md5

kallithea/lib/indexers/__init__.py

➞

Show inline comments

@@ @@ -30,13 +30,13 @@ import sys @@
 import logging
 from os.path import dirname as dn, join as jn
 # 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
 from kallithea.lib.utils2 import LazyProperty
 log = logging.getLogger(__name__)

kallithea/lib/paster_commands/make_index.py

➞

Show inline comments

@@ @@ -31,13 +31,12 @@ from __future__ import with_statement @@
 import os
 import sys
 import logging
 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
 # Add location of top level folder to sys.path
 from os.path import dirname as dn
 rc_path = dn(dn(dn(os.path.realpath(__file__))))

kallithea/lib/profiler.py

➞

Show inline comments

 from __future__ import with_statement
 import gc
 import objgraph
 import cProfile
 import pstats
 import cgi
 import pprint
 import threading

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -43,15 +43,12 @@ from paste.script.command import Command @@
 from webhelpers.text import collapse, remove_formatting, strip_tags
 from beaker.cache import _cache_decorate
 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
 from kallithea.lib.caching_query import FromCache
@@ @@ -59,13 +56,12 @@ from kallithea.model import meta @@
 from kallithea.model.db import Repository, User, Ui, \
     UserLog, RepoGroup, Setting, CacheInvalidation, UserGroup
 from kallithea.model.meta import Session
 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__)
 REMOVED_REPO_PAT = re.compile(r'rm__\d{8}_\d{6}_\d{6}__.*')

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -321,13 +321,12 @@ def engine_from_config(configuration, pr @@
         if url.startswith('sqlite'):
             kwargs.update({'poolclass': NullPool})
         return efc(configuration, prefix, **kwargs)
     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)
         engine = efc(configuration, prefix, **kwargs)
         def color_sql(sql):

kallithea/lib/vcs/backends/git/inmemory.py

➞

Show inline comments

 import time
 import datetime
 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
 class GitInMemoryChangeset(BaseInMemoryChangeset):

kallithea/lib/vcs/backends/hg/repository.py

➞

Show inline comments

@@ @@ -13,15 +13,13 @@ import os @@
 import time
 import urllib
 import urllib2
 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,
     RepositoryError, VCSError, TagAlreadyExistError, TagDoesNotExistError
+)
 from kallithea.lib.vcs.utils import (

kallithea/lib/vcs/nodes.py

➞

Show inline comments

@@ @@ -5,13 +5,13 @@ @@
     Module holding everything related to vcs nodes.
     :created_on: Apr 8, 2010
     :copyright: (c) 2010-2011 by Marcin Kuzminski, Lukasz Balcerzak.
 """
-import os
 import stat
 import posixpath
 import mimetypes
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.exceptions import NodeError, RemovedFileNodeError

kallithea/lib/vcs/utils/__init__.py

➞

Show inline comments

 """
 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
 def makedate():
     lt = time.localtime()

kallithea/lib/verlib.py

➞

Show inline comments

 """
 "Rational" version definition and parsing for DistutilsVersionFight
 discussion at PyCon 2009.
 """
 import sys
 import re
 class IrrationalVersionError(Exception):
     """This is an irrational version."""
     pass

kallithea/model/comment.py

➞

Show inline comments

@@ @@ -23,21 +23,20 @@ Original author and date, and relevant c @@
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 import traceback
 from pylons.i18n.translation import _
 from sqlalchemy.util.compat import defaultdict
 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
 log = logging.getLogger(__name__)

kallithea/model/db.py

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ import hashlib @@
 import collections
 import functools
 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
 from pylons.i18n.translation import lazy_ugettext as _
 from kallithea import DB_PREFIX

kallithea/model/gist.py

➞

Show inline comments

@@ @@ -29,17 +29,15 @@ from __future__ import with_statement @@
 import os
 import time
 import logging
 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
 from kallithea.model.scm import ScmModel
 log = logging.getLogger(__name__)

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -23,14 +23,12 @@ Original author and date, and relevant c @@
 :created_on: Nov 20, 2011
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import os
 import logging
 import traceback
 from pylons import tmpl_context as c
 from pylons.i18n.translation import _

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -36,13 +36,13 @@ from kallithea.lib.utils import make_ui @@
 from kallithea.lib.vcs.backends import get_backend
 from kallithea.lib.compat import json
 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, \
     UserRepoGroupToPerm, UserGroupRepoGroupToPerm, User, Permission, \
     Statistics, UserGroup, Ui, RepoGroup, \
     Setting, RepositoryField

kallithea/tests/__init__.py

➞

Show inline comments

@@ @@ -39,31 +39,27 @@ import datetime @@
 import hashlib
 import tempfile
 from os.path import join as jn
 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
 from pylons.i18n.translation import _get_translator
 from pylons.util import ContextObj
 from routes.util import URLGenerator
 from webtest import TestApp
 from nose.plugins.skip import SkipTest
 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'
 if not is_windows:
     time.tzset()
@@ @@ -137,12 +133,13 @@ GIT_REMOTE_REPO = jn(TESTS_TMP_PATH, GIT @@
 HG_REMOTE_REPO = jn(TESTS_TMP_PATH, HG_REPO)
 #skip ldap tests if LDAP lib is not installed
 ldap_lib_installed = False
 try:
     import ldap
     ldap.API_VERSION
     ldap_lib_installed = True
 except ImportError:
     # means that python-ldap is not installed
     pass

kallithea/tests/functional/test_admin_gists.py

➞

Show inline comments

 import datetime
 from kallithea.tests import *
 from kallithea.model.gist import GistModel
 from kallithea.model.meta import Session
 from kallithea.model.db import User, Gist

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -8,13 +8,12 @@ from kallithea.lib import vcs @@
 from kallithea.model.db import Repository, RepoGroup, UserRepoToPerm, User,\
     Permission
 from kallithea.model.user import UserModel
 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
 fixture = Fixture()

kallithea/tests/functional/test_admin_settings.py

➞

Show inline comments

 # -*- 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()
 class TestAdminSettingsController(TestController):

kallithea/tests/functional/test_changeset_comments.py

➞

Show inline comments

 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
 class TestChangeSetCommentsController(TestController):

kallithea/tests/functional/test_home.py

➞

Show inline comments

 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
 fixture = Fixture()

kallithea/tests/functional/test_journal.py

➞

Show inline comments

 from kallithea.tests import *
 from kallithea.model.db import UserFollowing, User, Repository
 from kallithea.lib.helpers import get_token
 import datetime
 class TestJournalController(TestController):
     def test_index(self):

kallithea/tests/models/test_user_groups.py

➞

Show inline comments

 import os
 from sqlalchemy.exc import IntegrityError
 from kallithea.model.db import User
 from kallithea.tests import *
 from kallithea.tests.fixture import Fixture
 from kallithea.model.user_group import UserGroupModel

kallithea/tests/models/test_user_permissions_on_repo_groups.py

➞

Show inline comments

 import functools
 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
 from kallithea.tests.models.common import _create_project_tree, check_tree_perms, \
     _get_perms, _check_expected_count, expected_count, _destroy_project_tree

kallithea/tests/scripts/test_concurency.py

➞

Show inline comments

@@ @@ -34,22 +34,21 @@ from os.path import join as jn @@
 from os.path import dirname as dn
 from tempfile import _RandomNameSequence
 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
 from kallithea.model import init_model
 from kallithea.model import meta
 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__)))))
 conf = appconfig('config:rc.ini', relative_to=rel_path)
 load_environment(conf.global_conf, conf.local_conf)

kallithea/tests/vcs/test_hg.py

➞

Show inline comments

 from __future__ import with_statement
 import os
 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
 # Use only clean mercurial's ui
 from kallithea.lib.vcs.utils.hgcompat import mercurial

0 comments (0 inline, 0 general)