##// END OF EJS Templates
flake8: fix some F401 '...' imported but unused
Mads Kiilerich -
r7719:fe408609 default
parent child Browse files
Show More
@@ -1,5 +1,4 b''
1 import os
1 import os
2 import sys
3
2
4 import mock
3 import mock
5 import pytest
4 import pytest
@@ -21,8 +21,6 b' Original author and date, and relevant c'
21 """
21 """
22 import sys
22 import sys
23
23
24 import click
25
26 import kallithea.bin.kallithea_cli_base as cli_base
24 import kallithea.bin.kallithea_cli_base as cli_base
27 from kallithea.model.db import *
25 from kallithea.model.db import *
28
26
@@ -23,7 +23,6 b' import platform'
23 import sys
23 import sys
24
24
25 import alembic.config
25 import alembic.config
26 import formencode
27 import mercurial
26 import mercurial
28 import tg
27 import tg
29 from alembic.migration import MigrationContext
28 from alembic.migration import MigrationContext
@@ -40,9 +39,8 b' from kallithea.lib.middleware.https_fixu'
40 from kallithea.lib.middleware.permanent_repo_url import PermanentRepoUrl
39 from kallithea.lib.middleware.permanent_repo_url import PermanentRepoUrl
41 from kallithea.lib.middleware.simplegit import SimpleGit
40 from kallithea.lib.middleware.simplegit import SimpleGit
42 from kallithea.lib.middleware.simplehg import SimpleHg
41 from kallithea.lib.middleware.simplehg import SimpleHg
43 from kallithea.lib.utils import check_git_version, load_rcextensions, make_ui, repo2db_mapper, set_app_settings, set_indexer_config, set_vcs_config
42 from kallithea.lib.utils import check_git_version, load_rcextensions, make_ui, set_app_settings, set_indexer_config, set_vcs_config
44 from kallithea.lib.utils2 import str2bool
43 from kallithea.lib.utils2 import str2bool
45 from kallithea.model.scm import ScmModel
46
44
47
45
48 log = logging.getLogger(__name__)
46 log = logging.getLogger(__name__)
@@ -26,7 +26,6 b' Original author and date, and relevant c'
26 """
26 """
27
27
28 import logging
28 import logging
29 import time
30 import traceback
29 import traceback
31
30
32 import formencode.htmlfill
31 import formencode.htmlfill
@@ -43,7 +42,7 b' from kallithea.lib.base import BaseContr'
43 from kallithea.lib.page import Page
42 from kallithea.lib.page import Page
44 from kallithea.lib.utils2 import safe_int, safe_unicode, time_to_datetime
43 from kallithea.lib.utils2 import safe_int, safe_unicode, time_to_datetime
45 from kallithea.lib.vcs.exceptions import NodeNotChangedError, VCSError
44 from kallithea.lib.vcs.exceptions import NodeNotChangedError, VCSError
46 from kallithea.model.db import Gist, User
45 from kallithea.model.db import Gist
47 from kallithea.model.forms import GistForm
46 from kallithea.model.forms import GistForm
48 from kallithea.model.gist import GistModel
47 from kallithea.model.gist import GistModel
49 from kallithea.model.meta import Session
48 from kallithea.model.meta import Session
@@ -30,7 +30,6 b' import traceback'
30
30
31 import formencode
31 import formencode
32 from formencode import htmlfill
32 from formencode import htmlfill
33 from sqlalchemy import func
34 from tg import request
33 from tg import request
35 from tg import tmpl_context as c
34 from tg import tmpl_context as c
36 from tg.i18n import ugettext as _
35 from tg.i18n import ugettext as _
@@ -31,7 +31,6 b' import traceback'
31
31
32 import formencode
32 import formencode
33 from formencode import htmlfill
33 from formencode import htmlfill
34 from sqlalchemy.sql.expression import func
35 from tg import app_globals, request
34 from tg import app_globals, request
36 from tg import tmpl_context as c
35 from tg import tmpl_context as c
37 from tg.i18n import ugettext as _
36 from tg.i18n import ugettext as _
@@ -30,7 +30,6 b' import traceback'
30
30
31 import formencode
31 import formencode
32 from formencode import htmlfill
32 from formencode import htmlfill
33 from sqlalchemy.sql.expression import func
34 from tg import request
33 from tg import request
35 from tg import tmpl_context as c
34 from tg import tmpl_context as c
36 from tg.i18n import ugettext as _
35 from tg.i18n import ugettext as _
@@ -42,7 +42,7 b' from kallithea.lib.base import BaseContr'
42 from kallithea.lib.celerylib import tasks
42 from kallithea.lib.celerylib import tasks
43 from kallithea.lib.exceptions import HgsubversionImportError
43 from kallithea.lib.exceptions import HgsubversionImportError
44 from kallithea.lib.utils import repo2db_mapper, set_app_settings
44 from kallithea.lib.utils import repo2db_mapper, set_app_settings
45 from kallithea.lib.utils2 import safe_unicode, str2bool
45 from kallithea.lib.utils2 import safe_unicode
46 from kallithea.lib.vcs import VCSError
46 from kallithea.lib.vcs import VCSError
47 from kallithea.model.db import Repository, Setting, Ui
47 from kallithea.model.db import Repository, Setting, Ui
48 from kallithea.model.forms import ApplicationSettingsForm, ApplicationUiSettingsForm, ApplicationVisualisationForm
48 from kallithea.model.forms import ApplicationSettingsForm, ApplicationUiSettingsForm, ApplicationVisualisationForm
@@ -48,7 +48,6 b' from kallithea.lib.utils2 import safe_in'
48 from kallithea.model.db import User, UserGroup, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserGroupToPerm
48 from kallithea.model.db import User, UserGroup, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserGroupToPerm
49 from kallithea.model.forms import CustomDefaultPermissionsForm, UserGroupForm, UserGroupPermsForm
49 from kallithea.model.forms import CustomDefaultPermissionsForm, UserGroupForm, UserGroupPermsForm
50 from kallithea.model.meta import Session
50 from kallithea.model.meta import Session
51 from kallithea.model.repo import RepoModel
52 from kallithea.model.scm import UserGroupList
51 from kallithea.model.scm import UserGroupList
53 from kallithea.model.user_group import UserGroupModel
52 from kallithea.model.user_group import UserGroupModel
54
53
@@ -33,14 +33,13 b' import traceback'
33 import types
33 import types
34
34
35 from tg import Response, TGController, request, response
35 from tg import Response, TGController, request, response
36 from webob.exc import HTTPError, HTTPException, WSGIHTTPException
36 from webob.exc import HTTPError, HTTPException
37
37
38 from kallithea.lib.auth import AuthUser
38 from kallithea.lib.auth import AuthUser
39 from kallithea.lib.base import _get_access_path
39 from kallithea.lib.base import _get_access_path
40 from kallithea.lib.base import _get_ip_addr as _get_ip
40 from kallithea.lib.base import _get_ip_addr as _get_ip
41 from kallithea.lib.compat import json
41 from kallithea.lib.compat import json
42 from kallithea.lib.utils2 import safe_str, safe_unicode
42 from kallithea.lib.utils2 import safe_str, safe_unicode
43 from kallithea.model import meta
44 from kallithea.model.db import User
43 from kallithea.model.db import User
45
44
46
45
@@ -26,22 +26,19 b' Original author and date, and relevant c'
26 """
26 """
27
27
28 import logging
28 import logging
29 import time
30 import traceback
29 import traceback
31 from datetime import datetime
30 from datetime import datetime
32
31
33 from sqlalchemy import or_
34 from tg import request
32 from tg import request
35
33
36 from kallithea.controllers.api import JSONRPCController, JSONRPCError
34 from kallithea.controllers.api import JSONRPCController, JSONRPCError
37 from kallithea.lib.auth import (
35 from kallithea.lib.auth import (
38 AuthUser, HasPermissionAny, HasPermissionAnyDecorator, HasRepoGroupPermissionLevel, HasRepoPermissionLevel, HasUserGroupPermissionLevel, PasswordGenerator)
36 AuthUser, HasPermissionAny, HasPermissionAnyDecorator, HasRepoGroupPermissionLevel, HasRepoPermissionLevel, HasUserGroupPermissionLevel)
39 from kallithea.lib.compat import json
40 from kallithea.lib.exceptions import DefaultUserException, UserGroupsAssignedException
37 from kallithea.lib.exceptions import DefaultUserException, UserGroupsAssignedException
41 from kallithea.lib.utils import action_logger, map_groups, repo2db_mapper
38 from kallithea.lib.utils import action_logger, repo2db_mapper
42 from kallithea.lib.utils2 import OAttr, Optional, safe_int, str2bool, time_to_datetime
39 from kallithea.lib.utils2 import OAttr, Optional
43 from kallithea.lib.vcs.backends.base import EmptyChangeset
40 from kallithea.lib.vcs.backends.base import EmptyChangeset
44 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError
41 from kallithea.lib.vcs.exceptions import EmptyRepositoryError
45 from kallithea.model.changeset_status import ChangesetStatusModel
42 from kallithea.model.changeset_status import ChangesetStatusModel
46 from kallithea.model.comment import ChangesetCommentsModel
43 from kallithea.model.comment import ChangesetCommentsModel
47 from kallithea.model.db import ChangesetStatus, Gist, Permission, PullRequest, RepoGroup, Repository, Setting, User, UserGroup, UserIpMap
44 from kallithea.model.db import ChangesetStatus, Gist, Permission, PullRequest, RepoGroup, Repository, Setting, User, UserGroup, UserIpMap
@@ -48,7 +48,6 b' from kallithea.model.comment import Chan'
48 from kallithea.model.db import ChangesetComment, ChangesetStatus
48 from kallithea.model.db import ChangesetComment, ChangesetStatus
49 from kallithea.model.meta import Session
49 from kallithea.model.meta import Session
50 from kallithea.model.pull_request import PullRequestModel
50 from kallithea.model.pull_request import PullRequestModel
51 from kallithea.model.repo import RepoModel
52
51
53
52
54 log = logging.getLogger(__name__)
53 log = logging.getLogger(__name__)
@@ -27,13 +27,12 b' Original author and date, and relevant c'
27
27
28 import cgi
28 import cgi
29 import logging
29 import logging
30 import os
31
30
32 from tg import config, expose, request
31 from tg import config, expose, request
33 from tg import tmpl_context as c
32 from tg import tmpl_context as c
34 from tg.i18n import ugettext as _
33 from tg.i18n import ugettext as _
35
34
36 from kallithea.lib.base import BaseController, render
35 from kallithea.lib.base import BaseController
37
36
38
37
39 log = logging.getLogger(__name__)
38 log = logging.getLogger(__name__)
@@ -28,8 +28,7 b' Original author and date, and relevant c'
28
28
29 import logging
29 import logging
30
30
31 from sqlalchemy import and_, or_
31 from sqlalchemy import or_
32 from sqlalchemy.sql.expression import func
33 from tg import request
32 from tg import request
34 from tg import tmpl_context as c
33 from tg import tmpl_context as c
35 from tg.i18n import ugettext as _
34 from tg.i18n import ugettext as _
@@ -32,7 +32,6 b' from itertools import groupby'
32
32
33 from sqlalchemy import or_
33 from sqlalchemy import or_
34 from sqlalchemy.orm import joinedload
34 from sqlalchemy.orm import joinedload
35 from sqlalchemy.sql.expression import func
36 from tg import request, response
35 from tg import request, response
37 from tg import tmpl_context as c
36 from tg import tmpl_context as c
38 from tg.i18n import ugettext as _
37 from tg.i18n import ugettext as _
@@ -36,14 +36,12 b' from webob.exc import HTTPBadRequest, HT'
36
36
37 from kallithea.config.routing import url
37 from kallithea.config.routing import url
38 from kallithea.controllers.changeset import _context_url, _ignorews_url, create_cs_pr_comment, delete_cs_pr_comment
38 from kallithea.controllers.changeset import _context_url, _ignorews_url, create_cs_pr_comment, delete_cs_pr_comment
39 from kallithea.controllers.compare import CompareController
40 from kallithea.lib import diffs
39 from kallithea.lib import diffs
41 from kallithea.lib import helpers as h
40 from kallithea.lib import helpers as h
42 from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired
41 from kallithea.lib.auth import HasRepoPermissionLevelDecorator, LoginRequired
43 from kallithea.lib.base import BaseRepoController, jsonify, render
42 from kallithea.lib.base import BaseRepoController, jsonify, render
44 from kallithea.lib.graphmod import graph_data
43 from kallithea.lib.graphmod import graph_data
45 from kallithea.lib.page import Page
44 from kallithea.lib.page import Page
46 from kallithea.lib.utils import action_logger
47 from kallithea.lib.utils2 import safe_int
45 from kallithea.lib.utils2 import safe_int
48 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError
46 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, EmptyRepositoryError
49 from kallithea.lib.vcs.utils import safe_str
47 from kallithea.lib.vcs.utils import safe_str
@@ -54,7 +52,6 b' from kallithea.model.db import Changeset'
54 from kallithea.model.forms import PullRequestForm, PullRequestPostForm
52 from kallithea.model.forms import PullRequestForm, PullRequestPostForm
55 from kallithea.model.meta import Session
53 from kallithea.model.meta import Session
56 from kallithea.model.pull_request import CreatePullRequestAction, CreatePullRequestIterationAction, PullRequestModel
54 from kallithea.model.pull_request import CreatePullRequestAction, CreatePullRequestIterationAction, PullRequestModel
57 from kallithea.model.repo import RepoModel
58
55
59
56
60 log = logging.getLogger(__name__)
57 log = logging.getLogger(__name__)
@@ -45,11 +45,11 b' from kallithea.lib.celerylib.tasks impor'
45 from kallithea.lib.compat import json
45 from kallithea.lib.compat import json
46 from kallithea.lib.markup_renderer import MarkupRenderer
46 from kallithea.lib.markup_renderer import MarkupRenderer
47 from kallithea.lib.page import RepoPage
47 from kallithea.lib.page import RepoPage
48 from kallithea.lib.utils2 import safe_int, safe_str
48 from kallithea.lib.utils2 import safe_int
49 from kallithea.lib.vcs.backends.base import EmptyChangeset
49 from kallithea.lib.vcs.backends.base import EmptyChangeset
50 from kallithea.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, NodeDoesNotExistError
50 from kallithea.lib.vcs.exceptions import ChangesetError, EmptyRepositoryError, NodeDoesNotExistError
51 from kallithea.lib.vcs.nodes import FileNode
51 from kallithea.lib.vcs.nodes import FileNode
52 from kallithea.model.db import CacheInvalidation, Statistics, User
52 from kallithea.model.db import CacheInvalidation, Statistics
53
53
54
54
55 log = logging.getLogger(__name__)
55 log = logging.getLogger(__name__)
@@ -24,26 +24,24 b' Original author and date, and relevant c'
24 :copyright: (c) 2013 RhodeCode GmbH, and others.
24 :copyright: (c) 2013 RhodeCode GmbH, and others.
25 :license: GPLv3, see LICENSE.md for more details.
25 :license: GPLv3, see LICENSE.md for more details.
26 """
26 """
27 import collections
28 import hashlib
27 import hashlib
29 import itertools
28 import itertools
30 import logging
29 import logging
31 import os
30 import os
32 import traceback
33
31
34 import ipaddr
32 import ipaddr
35 from decorator import decorator
33 from decorator import decorator
36 from sqlalchemy.orm import joinedload
34 from sqlalchemy.orm import joinedload
37 from sqlalchemy.orm.exc import ObjectDeletedError
35 from sqlalchemy.orm.exc import ObjectDeletedError
38 from tg import request, session
36 from tg import request
39 from tg.i18n import ugettext as _
37 from tg.i18n import ugettext as _
40 from webob.exc import HTTPBadRequest, HTTPForbidden, HTTPFound, HTTPMethodNotAllowed
38 from webob.exc import HTTPForbidden, HTTPFound
41
39
42 from kallithea import __platform__, is_unix, is_windows
40 from kallithea import __platform__, is_unix, is_windows
43 from kallithea.config.routing import url
41 from kallithea.config.routing import url
44 from kallithea.lib.caching_query import FromCache
42 from kallithea.lib.caching_query import FromCache
45 from kallithea.lib.utils import conditional_cache, get_repo_group_slug, get_repo_slug, get_user_group_slug
43 from kallithea.lib.utils import conditional_cache, get_repo_group_slug, get_repo_slug, get_user_group_slug
46 from kallithea.lib.utils2 import aslist, safe_str, safe_unicode
44 from kallithea.lib.utils2 import safe_str, safe_unicode
47 from kallithea.lib.vcs.utils.lazy import LazyProperty
45 from kallithea.lib.vcs.utils.lazy import LazyProperty
48 from kallithea.model.db import (
46 from kallithea.model.db import (
49 Permission, RepoGroup, Repository, User, UserApiKeys, UserGroup, UserGroupMember, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserGroupToPerm, UserGroupUserGroupToPerm, UserIpMap, UserToPerm)
47 Permission, RepoGroup, Repository, User, UserApiKeys, UserGroup, UserGroupMember, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserGroupToPerm, UserGroupUserGroupToPerm, UserIpMap, UserToPerm)
@@ -30,7 +30,7 b' import logging'
30 from kallithea.lib import auth_modules
30 from kallithea.lib import auth_modules
31 from kallithea.lib.compat import hybrid_property
31 from kallithea.lib.compat import hybrid_property
32 from kallithea.lib.utils2 import safe_str, safe_unicode, str2bool
32 from kallithea.lib.utils2 import safe_str, safe_unicode, str2bool
33 from kallithea.model.db import Setting, User
33 from kallithea.model.db import Setting
34
34
35
35
36 log = logging.getLogger(__name__)
36 log = logging.getLogger(__name__)
@@ -32,7 +32,6 b' import urllib2'
32
32
33 from kallithea.lib import auth_modules
33 from kallithea.lib import auth_modules
34 from kallithea.lib.compat import formatted_json, hybrid_property, json
34 from kallithea.lib.compat import formatted_json, hybrid_property, json
35 from kallithea.model.db import User
36
35
37
36
38 log = logging.getLogger(__name__)
37 log = logging.getLogger(__name__)
@@ -27,13 +27,11 b' Original author and date, and relevant c'
27
27
28
28
29 import logging
29 import logging
30 import traceback
31
30
32 from kallithea.lib import auth_modules
31 from kallithea.lib import auth_modules
33 from kallithea.lib.compat import hybrid_property
32 from kallithea.lib.compat import hybrid_property
34 from kallithea.lib.exceptions import LdapConnectionError, LdapImportError, LdapPasswordError, LdapUsernameError
33 from kallithea.lib.exceptions import LdapConnectionError, LdapImportError, LdapPasswordError, LdapUsernameError
35 from kallithea.lib.utils2 import safe_str, safe_unicode
34 from kallithea.lib.utils2 import safe_str, safe_unicode
36 from kallithea.model.db import User
37
35
38
36
39 log = logging.getLogger(__name__)
37 log = logging.getLogger(__name__)
@@ -37,7 +37,6 b' from kallithea import CELERY_EAGER, CELE'
37 from kallithea.lib.pidlock import DaemonLock, LockHeld
37 from kallithea.lib.pidlock import DaemonLock, LockHeld
38 from kallithea.lib.utils2 import safe_str
38 from kallithea.lib.utils2 import safe_str
39 from kallithea.model import meta
39 from kallithea.model import meta
40 from kallithea.model.base import init_model
41
40
42
41
43 log = logging.getLogger(__name__)
42 log = logging.getLogger(__name__)
@@ -14,9 +14,6 b' To make sure that the config really has '
14 mandatory settings.
14 mandatory settings.
15 """
15 """
16
16
17 import os
18 import warnings
19
20 import celery
17 import celery
21 import celery.result as result
18 import celery.result as result
22 import tg
19 import tg
@@ -29,9 +29,7 b' Original author and date, and relevant c'
29 import logging
29 import logging
30 import os
30 import os
31 import sys
31 import sys
32 import time
33 import uuid
32 import uuid
34 from os.path import dirname
35
33
36 import alembic.command
34 import alembic.command
37 import alembic.config
35 import alembic.config
@@ -39,11 +37,10 b' import sqlalchemy'
39 from sqlalchemy.engine import create_engine
37 from sqlalchemy.engine import create_engine
40
38
41 from kallithea.model.base import init_model
39 from kallithea.model.base import init_model
42 from kallithea.model.db import CacheInvalidation, Permission, RepoGroup, Repository, Setting, Ui, User, UserRepoGroupToPerm, UserToPerm
40 from kallithea.model.db import Permission, RepoGroup, Repository, Setting, Ui, User, UserRepoGroupToPerm, UserToPerm
43 #from kallithea.model import meta
41 #from kallithea.model import meta
44 from kallithea.model.meta import Base, Session
42 from kallithea.model.meta import Base, Session
45 from kallithea.model.permission import PermissionModel
43 from kallithea.model.permission import PermissionModel
46 from kallithea.model.repo import RepoModel
47 from kallithea.model.repo_group import RepoGroupModel
44 from kallithea.model.repo_group import RepoGroupModel
48 from kallithea.model.user import UserModel
45 from kallithea.model.user import UserModel
49
46
@@ -25,11 +25,6 b' Original author and date, and relevant c'
25 :license: GPLv3, see LICENSE.md for more details.
25 :license: GPLv3, see LICENSE.md for more details.
26 """
26 """
27
27
28 from webob.exc import HTTPClientError
29
30 from kallithea.lib.utils2 import safe_str
31
32
33 class LdapUsernameError(Exception):
28 class LdapUsernameError(Exception):
34 pass
29 pass
35
30
@@ -34,8 +34,8 b' from kallithea.lib.exceptions import Use'
34 from kallithea.lib.utils import action_logger, make_ui, setup_cache_regions
34 from kallithea.lib.utils import action_logger, make_ui, setup_cache_regions
35 from kallithea.lib.utils2 import get_hook_environment, safe_str, safe_unicode
35 from kallithea.lib.utils2 import get_hook_environment, safe_str, safe_unicode
36 from kallithea.lib.vcs.backends.base import EmptyChangeset
36 from kallithea.lib.vcs.backends.base import EmptyChangeset
37 from kallithea.lib.vcs.utils.hgcompat import nullrev, revrange
37 from kallithea.lib.vcs.utils.hgcompat import revrange
38 from kallithea.model.db import Repository, Ui, User
38 from kallithea.model.db import Repository, User
39
39
40
40
41 def _get_scm_size(alias, root_path):
41 def _get_scm_size(alias, root_path):
@@ -36,7 +36,6 b' from time import mktime'
36
36
37 from whoosh.index import create_in, exists_in, open_dir
37 from whoosh.index import create_in, exists_in, open_dir
38 from whoosh.qparser import QueryParser
38 from whoosh.qparser import QueryParser
39 from whoosh.query import *
40
39
41 from kallithea.config.conf import INDEX_EXTENSIONS, INDEX_FILENAMES
40 from kallithea.config.conf import INDEX_EXTENSIONS, INDEX_FILENAMES
42 from kallithea.lib.indexers import CHGSET_IDX_NAME, CHGSETS_SCHEMA, IDX_NAME, SCHEMA
41 from kallithea.lib.indexers import CHGSET_IDX_NAME, CHGSETS_SCHEMA, IDX_NAME, SCHEMA
@@ -36,7 +36,7 b' from kallithea.lib.hooks import log_pull'
36 from kallithea.lib.middleware.pygrack import make_wsgi_app
36 from kallithea.lib.middleware.pygrack import make_wsgi_app
37 from kallithea.lib.utils import make_ui
37 from kallithea.lib.utils import make_ui
38 from kallithea.lib.utils2 import safe_unicode
38 from kallithea.lib.utils2 import safe_unicode
39 from kallithea.model.db import Repository, Ui
39 from kallithea.model.db import Repository
40
40
41
41
42 log = logging.getLogger(__name__)
42 log = logging.getLogger(__name__)
@@ -33,7 +33,6 b' import traceback'
33
33
34 import beaker
34 import beaker
35 from beaker.cache import _cache_decorate
35 from beaker.cache import _cache_decorate
36 from tg import request, response
37 from tg.i18n import ugettext as _
36 from tg.i18n import ugettext as _
38
37
39 from kallithea.lib.exceptions import HgsubversionImportError
38 from kallithea.lib.exceptions import HgsubversionImportError
@@ -33,13 +33,10 b' import datetime'
33 import os
33 import os
34 import pwd
34 import pwd
35 import re
35 import re
36 import sys
37 import time
36 import time
38 import urllib
37 import urllib
39 import uuid
40
38
41 import urlobject
39 import urlobject
42 import webob
43 from tg.i18n import ugettext as _
40 from tg.i18n import ugettext as _
44 from tg.i18n import ungettext
41 from tg.i18n import ungettext
45 from webhelpers2.text import collapse, remove_formatting, strip_tags
42 from webhelpers2.text import collapse, remove_formatting, strip_tags
@@ -19,8 +19,6 b" VERSION = (0, 5, 0, 'dev')"
19 'VCSError', 'RepositoryError', 'ChangesetError'
19 'VCSError', 'RepositoryError', 'ChangesetError'
20 ]
20 ]
21
21
22 import sys
23
24 from kallithea.lib.vcs.backends import get_backend, get_repo
22 from kallithea.lib.vcs.backends import get_backend, get_repo
25 from kallithea.lib.vcs.exceptions import ChangesetError, RepositoryError, VCSError
23 from kallithea.lib.vcs.exceptions import ChangesetError, RepositoryError, VCSError
26
24
@@ -1,8 +1,6 b''
1 import os
1 import os
2 import posixpath
2 import posixpath
3
3
4 from mercurial import obsolete
5
6 from kallithea.lib.vcs.backends.base import BaseChangeset
4 from kallithea.lib.vcs.backends.base import BaseChangeset
7 from kallithea.lib.vcs.conf import settings
5 from kallithea.lib.vcs.conf import settings
8 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, ChangesetError, ImproperArchiveTypeError, NodeDoesNotExistError, VCSError
6 from kallithea.lib.vcs.exceptions import ChangesetDoesNotExistError, ChangesetError, ImproperArchiveTypeError, NodeDoesNotExistError, VCSError
@@ -1,5 +1,4 b''
1 import datetime
1 import datetime
2 import errno
3
2
4 from kallithea.lib.vcs.backends.base import BaseInMemoryChangeset
3 from kallithea.lib.vcs.backends.base import BaseInMemoryChangeset
5 from kallithea.lib.vcs.exceptions import RepositoryError
4 from kallithea.lib.vcs.exceptions import RepositoryError
@@ -22,7 +22,7 b' from kallithea.lib.vcs.exceptions import'
22 BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError, TagDoesNotExistError, VCSError)
22 BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError, TagAlreadyExistError, TagDoesNotExistError, VCSError)
23 from kallithea.lib.vcs.utils import author_email, author_name, date_fromtimestamp, makedate, safe_str, safe_unicode
23 from kallithea.lib.vcs.utils import author_email, author_name, date_fromtimestamp, makedate, safe_str, safe_unicode
24 from kallithea.lib.vcs.utils.hgcompat import (
24 from kallithea.lib.vcs.utils.hgcompat import (
25 Abort, RepoError, RepoLookupError, clone, diffopts, get_contact, hex, hg_url, httpbasicauthhandler, httpdigestauthhandler, httppeer, localrepo, match, match_exact, nullid, patch, peer, scmutil, sshpeer, tag, ui)
25 Abort, RepoError, RepoLookupError, clone, diffopts, get_contact, hex, hg_url, httpbasicauthhandler, httpdigestauthhandler, httppeer, localrepo, match_exact, nullid, patch, peer, scmutil, sshpeer, tag, ui)
26 from kallithea.lib.vcs.utils.lazy import LazyProperty
26 from kallithea.lib.vcs.utils.lazy import LazyProperty
27 from kallithea.lib.vcs.utils.paths import abspath
27 from kallithea.lib.vcs.utils.paths import abspath
28
28
@@ -7,7 +7,6 b' import datetime'
7 import os
7 import os
8 import re
8 import re
9 import time
9 import time
10 from subprocess import PIPE, Popen
11
10
12 from kallithea.lib.vcs.exceptions import RepositoryError, VCSError
11 from kallithea.lib.vcs.exceptions import RepositoryError, VCSError
13 from kallithea.lib.vcs.utils.paths import abspath
12 from kallithea.lib.vcs.utils.paths import abspath
@@ -47,8 +47,7 b' import kallithea'
47 from kallithea.lib.caching_query import FromCache
47 from kallithea.lib.caching_query import FromCache
48 from kallithea.lib.compat import json
48 from kallithea.lib.compat import json
49 from kallithea.lib.exceptions import DefaultUserException
49 from kallithea.lib.exceptions import DefaultUserException
50 from kallithea.lib.utils2 import (
50 from kallithea.lib.utils2 import Optional, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_int, safe_str, safe_unicode, str2bool, urlreadable
51 Optional, aslist, get_changeset_safe, get_clone_url, remove_prefix, safe_int, safe_str, safe_unicode, str2bool, time_to_datetime, urlreadable)
52 from kallithea.lib.vcs import get_backend
51 from kallithea.lib.vcs import get_backend
53 from kallithea.lib.vcs.backends.base import EmptyChangeset
52 from kallithea.lib.vcs.backends.base import EmptyChangeset
54 from kallithea.lib.vcs.utils.helpers import get_scm
53 from kallithea.lib.vcs.utils.helpers import get_scm
@@ -28,9 +28,7 b' Original author and date, and relevant c'
28
28
29 import datetime
29 import datetime
30 import logging
30 import logging
31 import traceback
32
31
33 from sqlalchemy.orm import joinedload, subqueryload
34 from tg import app_globals
32 from tg import app_globals
35 from tg import tmpl_context as c
33 from tg import tmpl_context as c
36 from tg.i18n import ugettext as _
34 from tg.i18n import ugettext as _
@@ -39,7 +37,6 b' import kallithea'
39 from kallithea.lib import helpers as h
37 from kallithea.lib import helpers as h
40 from kallithea.lib.utils2 import safe_unicode
38 from kallithea.lib.utils2 import safe_unicode
41 from kallithea.model.db import User
39 from kallithea.model.db import User
42 from kallithea.model.meta import Session
43
40
44
41
45 log = logging.getLogger(__name__)
42 log = logging.getLogger(__name__)
@@ -29,7 +29,6 b' import datetime'
29 import logging
29 import logging
30 import re
30 import re
31
31
32 from sqlalchemy.orm import joinedload
33 from tg import request
32 from tg import request
34 from tg.i18n import ugettext as _
33 from tg.i18n import ugettext as _
35
34
@@ -32,8 +32,6 b' import shutil'
32 import traceback
32 import traceback
33 from datetime import datetime
33 from datetime import datetime
34
34
35 from sqlalchemy.orm import subqueryload
36
37 import kallithea.lib.utils2
35 import kallithea.lib.utils2
38 from kallithea.lib import helpers as h
36 from kallithea.lib import helpers as h
39 from kallithea.lib.auth import HasRepoPermissionLevel, HasUserGroupPermissionLevel
37 from kallithea.lib.auth import HasRepoPermissionLevel, HasUserGroupPermissionLevel
@@ -45,7 +43,6 b' from kallithea.lib.utils2 import LazyPro'
45 from kallithea.lib.vcs.backends import get_backend
43 from kallithea.lib.vcs.backends import get_backend
46 from kallithea.model.db import (
44 from kallithea.model.db import (
47 Permission, RepoGroup, Repository, RepositoryField, Session, Statistics, Ui, User, UserGroup, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserRepoGroupToPerm, UserRepoToPerm)
45 Permission, RepoGroup, Repository, RepositoryField, Session, Statistics, Ui, User, UserGroup, UserGroupRepoGroupToPerm, UserGroupRepoToPerm, UserRepoGroupToPerm, UserRepoToPerm)
48 from kallithea.model.scm import UserGroupList
49
46
50
47
51 log = logging.getLogger(__name__)
48 log = logging.getLogger(__name__)
@@ -31,16 +31,13 b' import os'
31 import posixpath
31 import posixpath
32 import re
32 import re
33 import sys
33 import sys
34 import time
35 import traceback
34 import traceback
36
35
37 import pkg_resources
36 import pkg_resources
38 from sqlalchemy import func
39 from tg.i18n import ugettext as _
37 from tg.i18n import ugettext as _
40
38
41 import kallithea
39 import kallithea
42 from kallithea import BACKENDS
40 from kallithea import BACKENDS
43 from kallithea.lib import helpers as h
44 from kallithea.lib.auth import HasPermissionAny, HasRepoGroupPermissionLevel, HasRepoPermissionLevel, HasUserGroupPermissionLevel
41 from kallithea.lib.auth import HasPermissionAny, HasRepoGroupPermissionLevel, HasRepoPermissionLevel, HasUserGroupPermissionLevel
45 from kallithea.lib.exceptions import IMCCommitError, NonRelativePathError
42 from kallithea.lib.exceptions import IMCCommitError, NonRelativePathError
46 from kallithea.lib.hooks import process_pushed_raw_ids
43 from kallithea.lib.hooks import process_pushed_raw_ids
@@ -368,8 +368,6 b' class UserModel(object):'
368 timestamp=timestamp)
368 timestamp=timestamp)
369
369
370 def verify_reset_password_token(self, email, timestamp, token):
370 def verify_reset_password_token(self, email, timestamp, token):
371 from kallithea.lib.celerylib import tasks
372 from kallithea.lib import auth
373 import kallithea.lib.helpers as h
371 import kallithea.lib.helpers as h
374 user = User.get_by_email(email)
372 user = User.get_by_email(email)
375 if user is None:
373 if user is None:
@@ -25,7 +25,6 b' import pytest'
25
25
26 from kallithea.lib.auth import AuthUser
26 from kallithea.lib.auth import AuthUser
27 from kallithea.lib.compat import json
27 from kallithea.lib.compat import json
28 from kallithea.lib.utils2 import time_to_datetime
29 from kallithea.model.changeset_status import ChangesetStatusModel
28 from kallithea.model.changeset_status import ChangesetStatusModel
30 from kallithea.model.db import ChangesetStatus, PullRequest, RepoGroup, Repository, Setting, Ui, User
29 from kallithea.model.db import ChangesetStatus, PullRequest, RepoGroup, Repository, Setting, Ui, User
31 from kallithea.model.gist import GistModel
30 from kallithea.model.gist import GistModel
@@ -20,13 +20,10 b' import tempfile'
20 import time
20 import time
21
21
22 import pytest
22 import pytest
23 from tg import config
24 from webtest import TestApp
23 from webtest import TestApp
25
24
26 from kallithea import model
27 from kallithea.lib.utils2 import safe_str
25 from kallithea.lib.utils2 import safe_str
28 from kallithea.model.db import User
26 from kallithea.model.db import User
29 from kallithea.model.meta import Session
30
27
31
28
32 log = logging.getLogger(__name__)
29 log = logging.getLogger(__name__)
@@ -1,6 +1,5 b''
1 import logging
1 import logging
2 import os
2 import os
3 import re
4 import sys
3 import sys
5 import time
4 import time
6
5
@@ -409,7 +409,7 b' def create_test_index(repo_location, con'
409 """
409 """
410
410
411 from kallithea.lib.indexers.daemon import WhooshIndexingDaemon
411 from kallithea.lib.indexers.daemon import WhooshIndexingDaemon
412 from kallithea.lib.pidlock import DaemonLock, LockHeld
412 from kallithea.lib.pidlock import DaemonLock
413
413
414 index_location = os.path.join(config['index_dir'])
414 index_location = os.path.join(config['index_dir'])
415 if not os.path.exists(index_location):
415 if not os.path.exists(index_location):
@@ -1,10 +1,4 b''
1 import time
2
3 from tg.util.webtest import test_context
4
5 from kallithea.model.db import User, UserIpMap
1 from kallithea.model.db import User, UserIpMap
6 from kallithea.model.meta import Session
7 from kallithea.model.user import UserModel
8 from kallithea.tests.base import *
2 from kallithea.tests.base import *
9
3
10
4
@@ -1,4 +1,3 b''
1 from kallithea.model.db import Repository
2 from kallithea.model.meta import Session
1 from kallithea.model.meta import Session
3 from kallithea.model.repo_group import RepoGroupModel
2 from kallithea.model.repo_group import RepoGroupModel
4 from kallithea.tests.base import TestController, url
3 from kallithea.tests.base import TestController, url
@@ -5,12 +5,11 b' import urllib'
5
5
6 import mock
6 import mock
7 import pytest
7 import pytest
8 from sqlalchemy import func
9
8
10 from kallithea.lib import vcs
9 from kallithea.lib import vcs
11 from kallithea.lib.utils2 import safe_str, safe_unicode
10 from kallithea.lib.utils2 import safe_str, safe_unicode
12 from kallithea.model.db import Permission, RepoGroup, Repository, Ui, User, UserRepoToPerm
11 from kallithea.model.db import Permission, RepoGroup, Repository, Ui, User, UserRepoToPerm
13 from kallithea.model.meta import Base, Session
12 from kallithea.model.meta import Session
14 from kallithea.model.repo import RepoModel
13 from kallithea.model.repo import RepoModel
15 from kallithea.model.repo_group import RepoGroupModel
14 from kallithea.model.repo_group import RepoGroupModel
16 from kallithea.model.user import UserModel
15 from kallithea.model.user import UserModel
@@ -13,7 +13,7 b''
13 # along with this program. If not, see <http://www.gnu.org/licenses/>.
13 # along with this program. If not, see <http://www.gnu.org/licenses/>.
14
14
15 import pytest
15 import pytest
16 from sqlalchemy.orm.exc import NoResultFound, ObjectDeletedError
16 from sqlalchemy.orm.exc import NoResultFound
17 from tg.util.webtest import test_context
17 from tg.util.webtest import test_context
18 from webob.exc import HTTPNotFound
18 from webob.exc import HTTPNotFound
19
19
@@ -21,7 +21,7 b' from kallithea.controllers.admin.users i'
21 from kallithea.lib import helpers as h
21 from kallithea.lib import helpers as h
22 from kallithea.lib.auth import check_password
22 from kallithea.lib.auth import check_password
23 from kallithea.model import validators
23 from kallithea.model import validators
24 from kallithea.model.db import Permission, RepoGroup, User, UserApiKeys, UserIpMap, UserSshKeys
24 from kallithea.model.db import Permission, RepoGroup, User, UserApiKeys, UserSshKeys
25 from kallithea.model.meta import Session
25 from kallithea.model.meta import Session
26 from kallithea.model.user import UserModel
26 from kallithea.model.user import UserModel
27 from kallithea.tests.base import *
27 from kallithea.tests.base import *
@@ -1,6 +1,5 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 import mimetypes
2 import mimetypes
3 import os
4 import posixpath
3 import posixpath
5
4
6 from kallithea.model.db import Repository
5 from kallithea.model.db import Repository
@@ -1,6 +1,5 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2
2
3 import unittest
4 import urllib
3 import urllib
5
4
6 from kallithea.lib.utils2 import safe_str, safe_unicode
5 from kallithea.lib.utils2 import safe_str, safe_unicode
@@ -1,7 +1,6 b''
1 # -*- coding: utf-8 -*-
1 # -*- coding: utf-8 -*-
2 import json
2 import json
3
3
4 from kallithea.model.db import Repository
5 from kallithea.model.meta import Session
4 from kallithea.model.meta import Session
6 from kallithea.model.repo import RepoModel
5 from kallithea.model.repo import RepoModel
7 from kallithea.model.repo_group import RepoGroupModel
6 from kallithea.model.repo_group import RepoGroupModel
@@ -3,7 +3,6 b' import re'
3 import time
3 import time
4 import urlparse
4 import urlparse
5
5
6 import mock
7 from tg.util.webtest import test_context
6 from tg.util.webtest import test_context
8
7
9 from kallithea.lib import helpers as h
8 from kallithea.lib import helpers as h
@@ -1,7 +1,6 b''
1 import re
1 import re
2
2
3 import pytest
3 import pytest
4 from tg.util.webtest import test_context
5
4
6 from kallithea.controllers.pullrequests import PullrequestsController
5 from kallithea.controllers.pullrequests import PullrequestsController
7 from kallithea.model.db import PullRequest, User
6 from kallithea.model.db import PullRequest, User
@@ -1,5 +1,3 b''
1 import os
2
3 import mock
1 import mock
4
2
5 from kallithea.tests.base import *
3 from kallithea.tests.base import *
@@ -4,7 +4,6 b' from kallithea.model.meta import Session'
4 from kallithea.model.repo import RepoModel
4 from kallithea.model.repo import RepoModel
5 from kallithea.model.repo_group import RepoGroupModel
5 from kallithea.model.repo_group import RepoGroupModel
6 from kallithea.model.user import UserModel
6 from kallithea.model.user import UserModel
7 from kallithea.tests.base import *
8 from kallithea.tests.fixture import Fixture
7 from kallithea.tests.fixture import Fixture
9
8
10
9
@@ -2,7 +2,6 b' import os'
2 import re
2 import re
3
3
4 import mock
4 import mock
5 import routes.util
6 from tg.util.webtest import test_context
5 from tg.util.webtest import test_context
7
6
8 import kallithea.lib.celerylib
7 import kallithea.lib.celerylib
@@ -3,8 +3,7 b' import uuid'
3 import pytest
3 import pytest
4
4
5 from kallithea.lib.auth_modules import auth_ldap, authenticate
5 from kallithea.lib.auth_modules import auth_ldap, authenticate
6 from kallithea.model.db import Setting, User
6 from kallithea.model.db import User
7 from kallithea.model.meta import Session
8
7
9
8
10 @pytest.fixture
9 @pytest.fixture
@@ -39,7 +39,6 b' import pytest'
39 from kallithea import CONFIG
39 from kallithea import CONFIG
40 from kallithea.model.db import CacheInvalidation, Repository, Ui, User, UserIpMap, UserLog
40 from kallithea.model.db import CacheInvalidation, Repository, Ui, User, UserIpMap, UserLog
41 from kallithea.model.meta import Session
41 from kallithea.model.meta import Session
42 from kallithea.model.repo import RepoModel
43 from kallithea.model.ssh_key import SshKeyModel
42 from kallithea.model.ssh_key import SshKeyModel
44 from kallithea.model.user import UserModel
43 from kallithea.model.user import UserModel
45 from kallithea.tests.base import *
44 from kallithea.tests.base import *
@@ -2,7 +2,6 b''
2 Module providing backend independent mixin class.
2 Module providing backend independent mixin class.
3 """
3 """
4 import datetime
4 import datetime
5 import os
6 import time
5 import time
7
6
8 import pytest
7 import pytest
@@ -1,7 +1,6 b''
1 # encoding: utf-8
1 # encoding: utf-8
2
2
3 import datetime
3 import datetime
4 import time
5
4
6 import pytest
5 import pytest
7
6
@@ -10,7 +9,6 b' from kallithea.lib.vcs.backends.base imp'
10 from kallithea.lib.vcs.exceptions import BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError
9 from kallithea.lib.vcs.exceptions import BranchDoesNotExistError, ChangesetDoesNotExistError, EmptyRepositoryError, RepositoryError
11 from kallithea.lib.vcs.nodes import AddedFileNodesGenerator, ChangedFileNodesGenerator, FileNode, RemovedFileNodesGenerator
10 from kallithea.lib.vcs.nodes import AddedFileNodesGenerator, ChangedFileNodesGenerator, FileNode, RemovedFileNodesGenerator
12 from kallithea.tests.vcs.base import _BackendTestMixin
11 from kallithea.tests.vcs.base import _BackendTestMixin
13 from kallithea.tests.vcs.conf import get_new_dir
14
12
15
13
16 class TestBaseChangeset(object):
14 class TestBaseChangeset(object):
@@ -4,7 +4,6 b' Tests so called "in memory changesets" c'
4 """
4 """
5
5
6 import datetime
6 import datetime
7 import time
8
7
9 import pytest
8 import pytest
10
9
General Comments 0
You need to be logged in to leave comments. Login now