kallithea Changeset - fe4086096758

Changeset - fe4086096758

Parent rev.

Child rev.

[Not reviewed]

default

! ! !

Mads Kiilerich - 6 years ago 2019-08-07 23:48:26
mads@kiilerich.com

Grafted from: d3422b061cac

flake8: fix some F401 '...' imported but unused

62 files changed with 27 insertions and 117 deletions:

conftest.py

kallithea/bin/kallithea_cli_ishell.py

kallithea/config/app_cfg.py

kallithea/controllers/admin/gists.py

kallithea/controllers/admin/my_account.py

kallithea/controllers/admin/repo_groups.py

kallithea/controllers/admin/repos.py

kallithea/controllers/admin/settings.py

kallithea/controllers/admin/user_groups.py

kallithea/controllers/api/__init__.py

kallithea/controllers/api/api.py

kallithea/controllers/changeset.py

kallithea/controllers/error.py

kallithea/controllers/home.py

kallithea/controllers/journal.py

kallithea/controllers/pullrequests.py

kallithea/controllers/summary.py

kallithea/lib/auth.py

kallithea/lib/auth_modules/auth_container.py

kallithea/lib/auth_modules/auth_crowd.py

kallithea/lib/auth_modules/auth_ldap.py

kallithea/lib/celerylib/__init__.py

kallithea/lib/celerypylons/__init__.py

kallithea/lib/db_manage.py

kallithea/lib/exceptions.py

kallithea/lib/hooks.py

kallithea/lib/indexers/daemon.py

kallithea/lib/middleware/simplegit.py

kallithea/lib/utils.py

kallithea/lib/utils2.py

kallithea/lib/vcs/__init__.py

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

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

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

kallithea/lib/vcs/utils/helpers.py

kallithea/model/db.py

kallithea/model/notification.py

kallithea/model/pull_request.py

kallithea/model/repo.py

kallithea/model/scm.py

kallithea/model/user.py

kallithea/tests/api/api_base.py

kallithea/tests/base.py

kallithea/tests/conftest.py

kallithea/tests/fixture.py

kallithea/tests/functional/test_admin_permissions.py

kallithea/tests/functional/test_admin_repo_groups.py

kallithea/tests/functional/test_admin_repos.py

kallithea/tests/functional/test_admin_users.py

kallithea/tests/functional/test_files.py

kallithea/tests/functional/test_forks.py

kallithea/tests/functional/test_home.py

kallithea/tests/functional/test_login.py

kallithea/tests/functional/test_pullrequests.py

kallithea/tests/functional/test_search.py

kallithea/tests/models/common.py

kallithea/tests/models/test_notifications.py

kallithea/tests/other/test_auth_ldap.py

kallithea/tests/other/test_vcs_operations.py

kallithea/tests/vcs/base.py

kallithea/tests/vcs/test_changesets.py

kallithea/tests/vcs/test_inmemchangesets.py

0 comments (0 inline, 0 general)

conftest.py

➞

Show inline comments

 import os
 import sys
 import mock
 import pytest
 here = os.path.dirname(__file__)

kallithea/bin/kallithea_cli_ishell.py

➞

Show inline comments

@@ @@ -18,14 +18,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 sys
 import click
 import kallithea.bin.kallithea_cli_base as cli_base
 from kallithea.model.db import *
 @cli_base.register_command(config_file_initialize_app=True)
 def ishell():

kallithea/config/app_cfg.py

➞

Show inline comments

@@ @@ -20,13 +20,12 @@ This file complements the .ini file. @@
 import logging
 import os
 import platform
 import sys
 import alembic.config
 import formencode
 import mercurial
 import tg
 from alembic.migration import MigrationContext
 from alembic.script.base import ScriptDirectory
 from sqlalchemy import create_engine
 from tg import hooks
@@ @@ -37,15 +36,14 @@ import kallithea.lib.locale @@
 import kallithea.model.base
 from kallithea.lib.auth import set_available_permissions
 from kallithea.lib.middleware.https_fixup import HttpsFixup
 from kallithea.lib.middleware.permanent_repo_url import PermanentRepoUrl
 from kallithea.lib.middleware.simplegit import SimpleGit
 from kallithea.lib.middleware.simplehg import SimpleHg
-from kallithea.lib.utils import check_git_version, load_rcextensions, make_ui, repo2db_mapper, set_app_settings, set_indexer_config, set_vcs_config
 from kallithea.lib.utils import check_git_version, load_rcextensions, make_ui, set_app_settings, set_indexer_config, set_vcs_config
 from kallithea.lib.utils2 import str2bool
 from kallithea.model.scm import ScmModel
 log = logging.getLogger(__name__)
 class KallitheaAppConfig(AppConfig):

kallithea/controllers/admin/gists.py

➞

Show inline comments

@@ @@ -23,13 +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
 import time
 import traceback
 import formencode.htmlfill
 from sqlalchemy.sql.expression import or_
 from tg import request, response
 from tg import tmpl_context as c
@@ @@ -40,13 +39,13 @@ from kallithea.config.routing import url @@
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import LoginRequired
 from kallithea.lib.base import BaseController, jsonify, render
 from kallithea.lib.page import Page
 from kallithea.lib.utils2 import safe_int, safe_unicode, time_to_datetime
 from kallithea.lib.vcs.exceptions import NodeNotChangedError, VCSError
-from kallithea.model.db import Gist, User
 from kallithea.model.db import Gist
 from kallithea.model.forms import GistForm
 from kallithea.model.gist import GistModel
 from kallithea.model.meta import Session
 log = logging.getLogger(__name__)

kallithea/controllers/admin/my_account.py

➞

Show inline comments

@@ @@ -27,13 +27,12 @@ Original author and date, and relevant c @@
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
 from sqlalchemy import func
 from tg import request
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 from webob.exc import HTTPFound
 from kallithea.config.routing import url

kallithea/controllers/admin/repo_groups.py

➞

Show inline comments

@@ @@ -28,13 +28,12 @@ Original author and date, and relevant c @@
 import itertools
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
 from sqlalchemy.sql.expression import func
 from tg import app_globals, request
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 from tg.i18n import ungettext
 from webob.exc import HTTPForbidden, HTTPFound, HTTPInternalServerError, HTTPNotFound

kallithea/controllers/admin/repos.py

➞

Show inline comments

@@ @@ -27,13 +27,12 @@ Original author and date, and relevant c @@
 import logging
 import traceback
 import formencode
 from formencode import htmlfill
 from sqlalchemy.sql.expression import func
 from tg import request
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 from webob.exc import HTTPForbidden, HTTPFound, HTTPInternalServerError, HTTPNotFound
 from kallithea.config.routing import url

kallithea/controllers/admin/settings.py

➞

Show inline comments

@@ @@ -39,13 +39,13 @@ from kallithea.config.routing import url @@
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import HasPermissionAnyDecorator, LoginRequired
 from kallithea.lib.base import BaseController, render
 from kallithea.lib.celerylib import tasks
 from kallithea.lib.exceptions import HgsubversionImportError
 from kallithea.lib.utils import repo2db_mapper, set_app_settings
-from kallithea.lib.utils2 import safe_unicode, str2bool
 from kallithea.lib.utils2 import safe_unicode
 from kallithea.lib.vcs import VCSError
 from kallithea.model.db import Repository, Setting, Ui
 from kallithea.model.forms import ApplicationSettingsForm, ApplicationUiSettingsForm, ApplicationVisualisationForm
 from kallithea.model.meta import Session
 from kallithea.model.notification import EmailNotificationModel
 from kallithea.model.scm import ScmModel

kallithea/controllers/admin/user_groups.py

➞

Show inline comments

@@ @@ -45,13 +45,12 @@ from kallithea.lib.base import BaseContr @@
 from kallithea.lib.exceptions import RepoGroupAssignmentError, UserGroupsAssignedException
 from kallithea.lib.utils import action_logger
 from kallithea.lib.utils2 import safe_int, safe_unicode
 from kallithea.model.db import User, UserGroup, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserGroupToPerm
 from kallithea.model.forms import CustomDefaultPermissionsForm, UserGroupForm, UserGroupPermsForm
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.scm import UserGroupList
 from kallithea.model.user_group import UserGroupModel
 log = logging.getLogger(__name__)

kallithea/controllers/api/__init__.py

➞

Show inline comments

@@ @@ -30,20 +30,19 @@ import itertools @@
 import logging
 import time
 import traceback
 import types
 from tg import Response, TGController, request, response
-from webob.exc import HTTPError, HTTPException, WSGIHTTPException
 from webob.exc import HTTPError, HTTPException
 from kallithea.lib.auth import AuthUser
 from kallithea.lib.base import _get_access_path
 from kallithea.lib.base import _get_ip_addr as _get_ip
 from kallithea.lib.compat import json
 from kallithea.lib.utils2 import safe_str, safe_unicode
 from kallithea.model import meta
 from kallithea.model.db import User
 log = logging.getLogger('JSONRPC')

kallithea/controllers/api/api.py

➞

Show inline comments

@@ @@ -23,28 +23,25 @@ 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 time
 import traceback
 from datetime import datetime
 from sqlalchemy import or_
 from tg import request
 from kallithea.controllers.api import JSONRPCController, JSONRPCError
 from kallithea.lib.auth import (
     AuthUser, HasPermissionAny, HasPermissionAnyDecorator, HasRepoGroupPermissionLevel, HasRepoPermissionLevel, HasUserGroupPermissionLevel, PasswordGenerator)
 from kallithea.lib.compat import json
     AuthUser, HasPermissionAny, HasPermissionAnyDecorator, HasRepoGroupPermissionLevel, HasRepoPermissionLevel, HasUserGroupPermissionLevel)
 from kallithea.lib.exceptions import DefaultUserException, UserGroupsAssignedException
 from kallithea.lib.utils import action_logger, map_groups, repo2db_mapper
 from kallithea.lib.utils2 import OAttr, Optional, safe_int, str2bool, time_to_datetime
 from kallithea.lib.utils import action_logger, repo2db_mapper
 from kallithea.lib.utils2 import OAttr, Optional
 from kallithea.lib.vcs.backends.base import EmptyChangeset
-from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError
 from kallithea.lib.vcs.exceptions import EmptyRepositoryError
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.comment import ChangesetCommentsModel
 from kallithea.model.db import ChangesetStatus, Gist, Permission, PullRequest, RepoGroup, Repository, Setting, User, UserGroup, UserIpMap
 from kallithea.model.gist import GistModel
 from kallithea.model.meta import Session
 from kallithea.model.pull_request import PullRequestModel

kallithea/controllers/changeset.py

➞

Show inline comments

@@ @@ -45,13 +45,12 @@ from kallithea.lib.vcs.backends.base imp @@
 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.comment import ChangesetCommentsModel
 from kallithea.model.db import ChangesetComment, ChangesetStatus
 from kallithea.model.meta import Session
 from kallithea.model.pull_request import PullRequestModel
 from kallithea.model.repo import RepoModel
 log = logging.getLogger(__name__)
 def _update_with_GET(params, GET):

kallithea/controllers/error.py

➞

Show inline comments

@@ @@ -24,19 +24,18 @@ Original author and date, and relevant c @@
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import cgi
 import logging
 import os
 from tg import config, expose, request
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
-from kallithea.lib.base import BaseController, render
 from kallithea.lib.base import BaseController
 log = logging.getLogger(__name__)
 class ErrorController(BaseController):

kallithea/controllers/home.py

➞

Show inline comments

@@ @@ -25,14 +25,13 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 from sqlalchemy import and_, or_
 from sqlalchemy.sql.expression import func
 from sqlalchemy import or_
 from tg import request
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 from webob.exc import HTTPBadRequest
 from kallithea.lib import helpers as h

kallithea/controllers/journal.py

➞

Show inline comments

@@ @@ -29,13 +29,12 @@ Original author and date, and relevant c @@
 import logging
 import traceback
 from itertools import groupby
 from sqlalchemy import or_
 from sqlalchemy.orm import joinedload
 from sqlalchemy.sql.expression import func
 from tg import request, response
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 from webhelpers.feedgenerator import Atom1Feed, Rss201rev2Feed
 from webob.exc import HTTPBadRequest

kallithea/controllers/pullrequests.py

➞

Show inline comments

@@ @@ -33,31 +33,28 @@ from tg import request @@
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPFound, HTTPNotFound
 from kallithea.config.routing import url
 from kallithea.controllers.changeset import _context_url, _ignorews_url, create_cs_pr_comment, delete_cs_pr_comment
 from kallithea.controllers.compare import CompareController
 from kallithea.lib import diffs
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired
 from kallithea.lib.base import BaseRepoController, jsonify, render
 from kallithea.lib.graphmod import graph_data
 from kallithea.lib.page import Page
 from kallithea.lib.utils import action_logger
 from kallithea.lib.utils2 import safe_int
 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError
 from kallithea.lib.vcs.utils import safe_str
 from kallithea.lib.vcs.utils.hgcompat import unionrepo
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.comment import ChangesetCommentsModel
 from kallithea.model.db import ChangesetStatus, PullRequest, PullRequestReviewer, Repository, User
 from kallithea.model.forms import PullRequestForm, PullRequestPostForm
 from kallithea.model.meta import Session
 from kallithea.model.pull_request import CreatePullRequestAction, CreatePullRequestIterationAction, PullRequestModel
 from kallithea.model.repo import RepoModel
 log = logging.getLogger(__name__)
 def _get_reviewer(user_id):

kallithea/controllers/summary.py

➞

Show inline comments

@@ @@ -42,17 +42,17 @@ from kallithea.config.conf import ALL_EX @@
 from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired
 from kallithea.lib.base import BaseRepoController, jsonify, render
 from kallithea.lib.celerylib.tasks import get_commits_stats
 from kallithea.lib.compat import json
 from kallithea.lib.markup_renderer import MarkupRenderer
 from kallithea.lib.page import RepoPage
-from kallithea.lib.utils2 import safe_int, safe_str
 from kallithea.lib.utils2 import safe_int
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, NodeDoesNotExistError
 from kallithea.lib.vcs.nodes import FileNode
-from kallithea.model.db import CacheInvalidation, Statistics, User
 from kallithea.model.db import CacheInvalidation, Statistics
 log = logging.getLogger(__name__)
 README_FILES = [''.join([x[0][0], x[1][0]]) for x in
                     sorted(list(itertools.product(ALL_READMES, ALL_EXTS)),

kallithea/lib/auth.py

➞

Show inline comments

@@ @@ -21,32 +21,30 @@ This file was forked by the Kallithea pr @@
 Original author and date, and relevant copyright and licensing information is below:
 :created_on: Apr 4, 2010
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import collections
 import hashlib
 import itertools
 import logging
 import os
 import traceback
 import ipaddr
 from decorator import decorator
 from sqlalchemy.orm import joinedload
 from sqlalchemy.orm.exc import ObjectDeletedError
-from tg import request, session
 from tg import request
 from tg.i18n import ugettext as _
-from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPFound, HTTPMethodNotAllowed
 from webob.exc import HTTPForbidden, HTTPFound
 from kallithea import __platform__, is_unix, is_windows
 from kallithea.config.routing import url
 from kallithea.lib.caching_query import FromCache
 from kallithea.lib.utils import conditional_cache, get_repo_group_slug, get_repo_slug, get_user_group_slug
-from kallithea.lib.utils2 import aslist, safe_str, safe_unicode
 from kallithea.lib.utils2 import safe_str, safe_unicode
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.model.db import (
     Permission, RepoGroup, Repository, User, UserApiKeys, UserGroup, UserGroupMember, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserGroupToPerm, UserGroupUserGroupToPerm, UserIpMap, UserToPerm)
 from kallithea.model.meta import Session
 from kallithea.model.user import UserModel

kallithea/lib/auth_modules/auth_container.py

➞

Show inline comments

@@ @@ -27,13 +27,13 @@ Original author and date, and relevant c @@
 import logging
 from kallithea.lib import auth_modules
 from kallithea.lib.compat import hybrid_property
 from kallithea.lib.utils2 import safe_str, safe_unicode, str2bool
-from kallithea.model.db import Setting, User
 from kallithea.model.db import Setting
 log = logging.getLogger(__name__)
 class KallitheaAuthPlugin(auth_modules.KallitheaExternalAuthPlugin):

kallithea/lib/auth_modules/auth_crowd.py

➞

Show inline comments

@@ @@ -29,13 +29,12 @@ Original author and date, and relevant c @@
 import base64
 import logging
 import urllib2
 from kallithea.lib import auth_modules
 from kallithea.lib.compat import formatted_json, hybrid_property, json
 from kallithea.model.db import User
 log = logging.getLogger(__name__)
 class CrowdServer(object):

kallithea/lib/auth_modules/auth_ldap.py

➞

Show inline comments

@@ @@ -24,19 +24,17 @@ 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
 from kallithea.lib import auth_modules
 from kallithea.lib.compat import hybrid_property
 from kallithea.lib.exceptions import LdapConnectionError, LdapImportError, LdapPasswordError, LdapUsernameError
 from kallithea.lib.utils2 import safe_str, safe_unicode
 from kallithea.model.db import User
 log = logging.getLogger(__name__)
 try:
     import ldap

kallithea/lib/celerylib/__init__.py

➞

Show inline comments

@@ @@ -34,13 +34,12 @@ from decorator import decorator @@
 from tg import config
 from kallithea import CELERY_EAGER, CELERY_ON
 from kallithea.lib.pidlock import DaemonLock, LockHeld
 from kallithea.lib.utils2 import safe_str
 from kallithea.model import meta
 from kallithea.model.base import init_model
 log = logging.getLogger(__name__)
 class FakeTask(object):

kallithea/lib/celerypylons/__init__.py

➞

Show inline comments

@@ @@ -11,15 +11,12 @@ thus not be imported in global scope but @@
 scope after tg.config has been initialized.
 To make sure that the config really has been initialized, we check one of the
 mandatory settings.
 """
 import os
 import warnings
 import celery
 import celery.result as result
 import tg
 from celery.bin import worker
 from celery.task import task

kallithea/lib/db_manage.py

➞

Show inline comments

@@ @@ -26,27 +26,24 @@ Original author and date, and relevant c @@
 :license: GPLv3, see LICENSE.md for more details.
 """
 import logging
 import os
 import sys
 import time
 import uuid
 from os.path import dirname
 import alembic.command
 import alembic.config
 import sqlalchemy
 from sqlalchemy.engine import create_engine
 from kallithea.model.base import init_model
-from kallithea.model.db import CacheInvalidation, Permission, RepoGroup, Repository, Setting, Ui, User, UserRepoGroupToPerm, UserToPerm
 from kallithea.model.db import Permission, RepoGroup, Repository, Setting, Ui, User, UserRepoGroupToPerm, UserToPerm
 #from kallithea.model import meta
 from kallithea.model.meta import Base, Session
 from kallithea.model.permission import PermissionModel
 from kallithea.model.repo import RepoModel
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.user import UserModel
 log = logging.getLogger(__name__)

kallithea/lib/exceptions.py

➞

Show inline comments

@@ @@ -22,17 +22,12 @@ Original author and date, and relevant c @@
 :created_on: Nov 17, 2010
 :author: marcink
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 from webob.exc import HTTPClientError
 from kallithea.lib.utils2 import safe_str
 class LdapUsernameError(Exception):
     pass
 class LdapPasswordError(Exception):
     pass

kallithea/lib/hooks.py

➞

Show inline comments

@@ @@ -31,14 +31,14 @@ import time @@
 from kallithea.lib import helpers as h
 from kallithea.lib.exceptions import UserCreationError
 from kallithea.lib.utils import action_logger, make_ui, setup_cache_regions
 from kallithea.lib.utils2 import get_hook_environment, safe_str, safe_unicode
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.utils.hgcompat import nullrev, revrange
 from kallithea.model.db import Repository, Ui, User
 from kallithea.lib.vcs.utils.hgcompat import revrange
 from kallithea.model.db import Repository, User
 def _get_scm_size(alias, root_path):
     if not alias.startswith('.'):
         alias += '.'

kallithea/lib/indexers/daemon.py

➞

Show inline comments

@@ @@ -33,13 +33,12 @@ import traceback @@
 from os.path import dirname
 from shutil import rmtree
 from time import mktime
 from whoosh.index import create_in, exists_in, open_dir
 from whoosh.qparser import QueryParser
 from whoosh.query import *
 from kallithea.config.conf import INDEX_EXTENSIONS, INDEX_FILENAMES
 from kallithea.lib.indexers import CHGSET_IDX_NAME, CHGSETS_SCHEMA, IDX_NAME, SCHEMA
 from kallithea.lib.utils2 import safe_str, safe_unicode
 from kallithea.lib.vcs.exceptions import ChangesetError, NodeDoesNotExistError, RepositoryError
 from kallithea.model.db import Repository

kallithea/lib/middleware/simplegit.py

➞

Show inline comments

@@ @@ -33,13 +33,13 @@ import re @@
 from kallithea.lib.base import BaseVCSController
 from kallithea.lib.hooks import log_pull_action
 from kallithea.lib.middleware.pygrack import make_wsgi_app
 from kallithea.lib.utils import make_ui
 from kallithea.lib.utils2 import safe_unicode
-from kallithea.model.db import Repository, Ui
 from kallithea.model.db import Repository
 log = logging.getLogger(__name__)
 GIT_PROTO_PAT = re.compile(r'^/(.+)/(info/refs|git-upload-pack|git-receive-pack)$')

kallithea/lib/utils.py

➞

Show inline comments

@@ @@ -30,13 +30,12 @@ import logging @@
 import os
 import re
 import traceback
 import beaker
 from beaker.cache import _cache_decorate
 from tg import request, response
 from tg.i18n import ugettext as _
 from kallithea.lib.exceptions import HgsubversionImportError
 from kallithea.lib.utils2 import get_current_authuser, safe_str, safe_unicode
 from kallithea.lib.vcs.exceptions import VCSError
 from kallithea.lib.vcs.utils.fakemod import create_module

kallithea/lib/utils2.py

➞

Show inline comments

@@ @@ -30,19 +30,16 @@ Original author and date, and relevant c @@
 import binascii
 import datetime
 import os
 import pwd
 import re
 import sys
 import time
 import urllib
 import uuid
 import urlobject
 import webob
 from tg.i18n import ugettext as _
 from tg.i18n import ungettext
 from webhelpers2.text import collapse, remove_formatting, strip_tags
 from kallithea.lib.compat import json
 from kallithea.lib.vcs.utils.lazy import LazyProperty

kallithea/lib/vcs/__init__.py

➞

Show inline comments

@@ @@ -16,14 +16,12 @@ __version__ = '.'.join((str(each) for ea @@
 __all__ = [
     'get_version', 'get_repo', 'get_backend',
     'VCSError', 'RepositoryError', 'ChangesetError'
+]
 import sys
 from kallithea.lib.vcs.backends import get_backend, get_repo
 from kallithea.lib.vcs.exceptions import ChangesetError, RepositoryError, VCSError
 def get_version():
     """

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

➞

Show inline comments

 import os
 import posixpath
 from mercurial import obsolete
 from kallithea.lib.vcs.backends.base import BaseChangeset
 from kallithea.lib.vcs.conf import settings
 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, ChangesetError, ImproperArchiveTypeError, NodeDoesNotExistError, VCSError
 from kallithea.lib.vcs.nodes import (
     AddedFileNodesGenerator, ChangedFileNodesGenerator, DirNode, FileNode, NodeKind, RemovedFileNodesGenerator, RootNode, SubModuleNode)
 from kallithea.lib.vcs.utils import date_fromtimestamp, safe_str, safe_unicode

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

➞

Show inline comments

 import datetime
 import errno
 from kallithea.lib.vcs.backends.base import BaseInMemoryChangeset
 from kallithea.lib.vcs.exceptions import RepositoryError
 from kallithea.lib.vcs.utils.hgcompat import hex, memctx, memfilectx, tolocal

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

➞

Show inline comments

@@ @@ -19,13 +19,13 @@ from collections import OrderedDict @@
 from kallithea.lib.vcs.backends.base import BaseRepository, CollectionGenerator
 from kallithea.lib.vcs.exceptions import (
     BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError, TagDoesNotExistError, VCSError)
 from kallithea.lib.vcs.utils import author_email, author_name, date_fromtimestamp, makedate, safe_str, safe_unicode
 from kallithea.lib.vcs.utils.hgcompat import (
-    Abort, RepoError, RepoLookupError, clone, diffopts, get_contact, hex, hg_url, httpbasicauthhandler, httpdigestauthhandler, httppeer, localrepo, match, match_exact, nullid, patch, peer, scmutil, sshpeer, tag, ui)
     Abort, RepoError, RepoLookupError, clone, diffopts, get_contact, hex, hg_url, httpbasicauthhandler, httpdigestauthhandler, httppeer, localrepo, match_exact, nullid, patch, peer, scmutil, sshpeer, tag, ui)
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.lib.vcs.utils.paths import abspath
 from .changeset import MercurialChangeset
 from .inmemory import MercurialInMemoryChangeset
 from .workdir import MercurialWorkdir

kallithea/lib/vcs/utils/helpers.py

➞

Show inline comments

@@ @@ -4,13 +4,12 @@ Utilities aimed to help achieve mostly b @@
 from __future__ import division
 import datetime
 import os
 import re
 import time
 from subprocess import PIPE, Popen
 from kallithea.lib.vcs.exceptions import RepositoryError, VCSError
 from kallithea.lib.vcs.utils.paths import abspath
 ALIASES = ['hg', 'git']

kallithea/model/db.py

➞

Show inline comments

@@ @@ -44,14 +44,13 @@ from tg.i18n import lazy_ugettext as _ @@
 from webob.exc import HTTPNotFound
 import kallithea
 from kallithea.lib.caching_query import FromCache
 from kallithea.lib.compat import json
 from kallithea.lib.exceptions import DefaultUserException
 from kallithea.lib.utils2 import (
     Optional, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_int, safe_str, safe_unicode, str2bool, time_to_datetime, urlreadable)
 from kallithea.lib.utils2 import Optional, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_int, safe_str, safe_unicode, str2bool, urlreadable
 from kallithea.lib.vcs import get_backend
 from kallithea.lib.vcs.backends.base import EmptyChangeset
 from kallithea.lib.vcs.utils.helpers import get_scm
 from kallithea.lib.vcs.utils.lazy import LazyProperty
 from kallithea.model.meta import Base, Session

kallithea/model/notification.py

➞

Show inline comments

@@ @@ -25,24 +25,21 @@ Original author and date, and relevant c @@
 :copyright: (c) 2013 RhodeCode GmbH, and others.
 :license: GPLv3, see LICENSE.md for more details.
 """
 import datetime
 import logging
 import traceback
 from sqlalchemy.orm import joinedload, subqueryload
 from tg import app_globals
 from tg import tmpl_context as c
 from tg.i18n import ugettext as _
 import kallithea
 from kallithea.lib import helpers as h
 from kallithea.lib.utils2 import safe_unicode
 from kallithea.model.db import User
 from kallithea.model.meta import Session
 log = logging.getLogger(__name__)
 class NotificationModel(object):

kallithea/model/pull_request.py

➞

Show inline comments

@@ @@ -26,13 +26,12 @@ Original author and date, and relevant c @@
 """
 import datetime
 import logging
 import re
 from sqlalchemy.orm import joinedload
 from tg import request
 from tg.i18n import ugettext as _
 from kallithea.lib import helpers as h
 from kallithea.lib.utils2 import extract_mentioned_users, safe_str, safe_unicode
 from kallithea.model.db import ChangesetStatus, PullRequest, PullRequestReviewer, User

kallithea/model/repo.py

➞

Show inline comments

@@ @@ -29,26 +29,23 @@ Original author and date, and relevant c @@
 import logging
 import os
 import shutil
 import traceback
 from datetime import datetime
 from sqlalchemy.orm import subqueryload
 import kallithea.lib.utils2
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import HasRepoPermissionLevel, HasUserGroupPermissionLevel
 from kallithea.lib.caching_query import FromCache
 from kallithea.lib.exceptions import AttachedForksError
 from kallithea.lib.hooks import log_delete_repository
 from kallithea.lib.utils import is_valid_repo_uri, make_ui
 from kallithea.lib.utils2 import LazyProperty, get_current_authuser, obfuscate_url_pw, remove_prefix, safe_str, safe_unicode
 from kallithea.lib.vcs.backends import get_backend
 from kallithea.model.db import (
     Permission, RepoGroup, Repository, RepositoryField, Session, Statistics, Ui, User, UserGroup, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserRepoGroupToPerm, UserRepoToPerm)
 from kallithea.model.scm import UserGroupList
 log = logging.getLogger(__name__)
 class RepoModel(object):

kallithea/model/scm.py

➞

Show inline comments

@@ @@ -28,22 +28,19 @@ Original author and date, and relevant c @@
 import cStringIO
 import logging
 import os
 import posixpath
 import re
 import sys
 import time
 import traceback
 import pkg_resources
 from sqlalchemy import func
 from tg.i18n import ugettext as _
 import kallithea
 from kallithea import BACKENDS
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import HasPermissionAny, HasRepoGroupPermissionLevel, HasRepoPermissionLevel, HasUserGroupPermissionLevel
 from kallithea.lib.exceptions import IMCCommitError, NonRelativePathError
 from kallithea.lib.hooks import process_pushed_raw_ids
 from kallithea.lib.utils import action_logger, get_filesystem_repos, make_ui
 from kallithea.lib.utils2 import safe_str, safe_unicode, set_hook_environment
 from kallithea.lib.vcs import get_backend

kallithea/model/user.py

➞

Show inline comments

@@ @@ -365,14 +365,12 @@ class UserModel(object): @@
         return h.url('reset_password_confirmation',
                      email=user_email,
                      timestamp=timestamp)
     def verify_reset_password_token(self, email, timestamp, token):
         from kallithea.lib.celerylib import tasks
         from kallithea.lib import auth
         import kallithea.lib.helpers as h
         user = User.get_by_email(email)
         if user is None:
             log.debug("user with email %s not found", email)
             return False

kallithea/tests/api/api_base.py

➞

Show inline comments

@@ @@ -22,13 +22,12 @@ import re @@
 import mock
 import pytest
 from kallithea.lib.auth import AuthUser
 from kallithea.lib.compat import json
 from kallithea.lib.utils2 import time_to_datetime
 from kallithea.model.changeset_status import ChangesetStatusModel
 from kallithea.model.db import ChangesetStatus, PullRequest, RepoGroup, Repository, Setting, Ui, User
 from kallithea.model.gist import GistModel
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.repo_group import RepoGroupModel

kallithea/tests/base.py

➞

Show inline comments

@@ @@ -17,19 +17,16 @@ import logging @@
 import os
 import re
 import tempfile
 import time
 import pytest
 from tg import config
 from webtest import TestApp
 from kallithea import model
 from kallithea.lib.utils2 import safe_str
 from kallithea.model.db import User
 from kallithea.model.meta import Session
 log = logging.getLogger(__name__)
 skipif = pytest.mark.skipif
 parametrize = pytest.mark.parametrize

kallithea/tests/conftest.py

➞

Show inline comments

 import logging
 import os
 import re
 import sys
 import time
 import formencode
 import pkg_resources
 import pytest

kallithea/tests/fixture.py

➞

Show inline comments

@@ @@ -406,13 +406,13 @@ def create_test_env(repos_test_path, con @@
 def create_test_index(repo_location, config, full_index):
     """
     Makes default test index
     """
     from kallithea.lib.indexers.daemon import WhooshIndexingDaemon
-    from kallithea.lib.pidlock import DaemonLock, LockHeld
     from kallithea.lib.pidlock import DaemonLock
     index_location = os.path.join(config['index_dir'])
     if not os.path.exists(index_location):
         os.makedirs(index_location)
     l = DaemonLock(os.path.join(index_location, 'make_index.lock'))

kallithea/tests/functional/test_admin_permissions.py

➞

Show inline comments

 import time
 from tg.util.webtest import test_context
 from kallithea.model.db import User, UserIpMap
 from kallithea.model.meta import Session
 from kallithea.model.user import UserModel
 from kallithea.tests.base import *
 class TestAdminPermissionsController(TestController):
     def test_index(self):

kallithea/tests/functional/test_admin_repo_groups.py

➞

Show inline comments

 from kallithea.model.db import Repository
 from kallithea.model.meta import Session
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.tests.base import TestController, url
 from kallithea.tests.fixture import Fixture

kallithea/tests/functional/test_admin_repos.py

➞

Show inline comments

@@ @@ -2,18 +2,17 @@ @@
 import os
 import urllib
 import mock
 import pytest
 from sqlalchemy import func
 from kallithea.lib import vcs
 from kallithea.lib.utils2 import safe_str, safe_unicode
 from kallithea.model.db import Permission, RepoGroup, Repository, Ui, User, UserRepoToPerm
-from kallithea.model.meta import Base, Session
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.user import UserModel
 from kallithea.tests.base import *
 from kallithea.tests.fixture import Fixture, error_function

kallithea/tests/functional/test_admin_users.py

➞

Show inline comments

@@ @@ -10,21 +10,21 @@ @@
 # GNU General Public License for more details.
+#
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import pytest
-from sqlalchemy.orm.exc import NoResultFound, ObjectDeletedError
 from sqlalchemy.orm.exc import NoResultFound
 from tg.util.webtest import test_context
 from webob.exc import HTTPNotFound
 from kallithea.controllers.admin.users import UsersController
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import check_password
 from kallithea.model import validators
-from kallithea.model.db import Permission, RepoGroup, User, UserApiKeys, UserIpMap, UserSshKeys
 from kallithea.model.db import Permission, RepoGroup, User, UserApiKeys, UserSshKeys
 from kallithea.model.meta import Session
 from kallithea.model.user import UserModel
 from kallithea.tests.base import *
 from kallithea.tests.fixture import Fixture

kallithea/tests/functional/test_files.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 import mimetypes
 import os
 import posixpath
 from kallithea.model.db import Repository
 from kallithea.model.meta import Session
 from kallithea.tests.base import *
 from kallithea.tests.fixture import Fixture

kallithea/tests/functional/test_forks.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 import unittest
 import urllib
 from kallithea.lib.utils2 import safe_str, safe_unicode
 from kallithea.model.db import Repository, User
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel

kallithea/tests/functional/test_home.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 import json
 from kallithea.model.db import Repository
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.tests.base import *
 from kallithea.tests.fixture import Fixture

kallithea/tests/functional/test_login.py

➞

Show inline comments

 # -*- coding: utf-8 -*-
 import re
 import time
 import urlparse
 import mock
 from tg.util.webtest import test_context
 from kallithea.lib import helpers as h
 from kallithea.lib.auth import check_password
 from kallithea.lib.utils2 import generate_api_key
 from kallithea.model import validators

kallithea/tests/functional/test_pullrequests.py

➞

Show inline comments

 import re
 import pytest
 from tg.util.webtest import test_context
 from kallithea.controllers.pullrequests import PullrequestsController
 from kallithea.model.db import PullRequest, User
 from kallithea.model.meta import Session
 from kallithea.tests.base import *
 from kallithea.tests.fixture import Fixture

kallithea/tests/functional/test_search.py

➞

Show inline comments

 import os
 import mock
 from kallithea.tests.base import *
 class TestSearchController(TestController):

kallithea/tests/models/common.py

➞

Show inline comments

 from kallithea.lib.auth import AuthUser
 from kallithea.model.db import RepoGroup, Repository, User
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.repo_group import RepoGroupModel
 from kallithea.model.user import UserModel
 from kallithea.tests.base import *
 from kallithea.tests.fixture import Fixture
 fixture = Fixture()

kallithea/tests/models/test_notifications.py

➞

Show inline comments

 import os
 import re
 import mock
 import routes.util
 from tg.util.webtest import test_context
 import kallithea.lib.celerylib
 import kallithea.lib.celerylib.tasks
 from kallithea.lib import helpers as h
 from kallithea.model.db import User

kallithea/tests/other/test_auth_ldap.py

➞

Show inline comments

 import uuid
 import pytest
 from kallithea.lib.auth_modules import auth_ldap, authenticate
 from kallithea.model.db import Setting, User
 from kallithea.model.meta import Session
 from kallithea.model.db import User
 @pytest.fixture
 def arrange_ldap_auth(set_test_settings):
     set_test_settings(
         ('auth_plugins', 'kallithea.lib.auth_modules.auth_ldap', 'list'),

kallithea/tests/other/test_vcs_operations.py

➞

Show inline comments

@@ @@ -36,13 +36,12 @@ from tempfile import _RandomNameSequence @@
 import pytest
 from kallithea import CONFIG
 from kallithea.model.db import CacheInvalidation, Repository, Ui, User, UserIpMap, UserLog
 from kallithea.model.meta import Session
 from kallithea.model.repo import RepoModel
 from kallithea.model.ssh_key import SshKeyModel
 from kallithea.model.user import UserModel
 from kallithea.tests.base import *
 from kallithea.tests.fixture import Fixture

kallithea/tests/vcs/base.py

➞

Show inline comments

 """
 Module providing backend independent mixin class.
 """
 import datetime
 import os
 import time
 import pytest
 from kallithea.lib import vcs
 from kallithea.lib.vcs.nodes import FileNode

kallithea/tests/vcs/test_changesets.py

➞

Show inline comments

 # encoding: utf-8
 import datetime
 import time
 import pytest
 from kallithea.lib import vcs
 from kallithea.lib.vcs.backends.base import BaseChangeset
 from kallithea.lib.vcs.exceptions import BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError
 from kallithea.lib.vcs.nodes import AddedFileNodesGenerator, ChangedFileNodesGenerator, FileNode, RemovedFileNodesGenerator
 from kallithea.tests.vcs.base import _BackendTestMixin
 from kallithea.tests.vcs.conf import get_new_dir
 class TestBaseChangeset(object):
     def test_as_dict(self):
         changeset = BaseChangeset()

kallithea/tests/vcs/test_inmemchangesets.py

➞

Show inline comments

 # encoding: utf-8
 """
 Tests so called "in memory changesets" commit API of vcs.
 """
 import datetime
 import time
 import pytest
 from kallithea.lib import vcs
 from kallithea.lib.vcs.exceptions import (
     EmptyRepositoryError, NodeAlreadyAddedError, NodeAlreadyChangedError, NodeAlreadyExistsError, NodeAlreadyRemovedError, NodeDoesNotExistError, NodeNotChangedError)

0 comments (0 inline, 0 general)