Show More
@@ -42,8 +42,7 b' from kallithea.lib.auth import LoginRequ' | |||||
42 | from kallithea.lib.base import BaseController, render |
|
42 | from kallithea.lib.base import BaseController, render | |
43 | from kallithea.lib.utils2 import generate_api_key, safe_int |
|
43 | from kallithea.lib.utils2 import generate_api_key, safe_int | |
44 | from kallithea.lib.compat import json |
|
44 | from kallithea.lib.compat import json | |
45 |
from kallithea.model.db import Repository, |
|
45 | from kallithea.model.db import Repository, UserEmailMap, User, UserFollowing | |
46 | UserEmailMap, UserApiKeys, User, UserFollowing |
|
|||
47 | from kallithea.model.forms import UserForm, PasswordChangeForm |
|
46 | from kallithea.model.forms import UserForm, PasswordChangeForm | |
48 | from kallithea.model.user import UserModel |
|
47 | from kallithea.model.user import UserModel | |
49 | from kallithea.model.repo import RepoModel |
|
48 | from kallithea.model.repo import RepoModel |
@@ -36,8 +36,7 b' from pylons.controllers.util import redi' | |||||
36 | from pylons.i18n.translation import _ |
|
36 | from pylons.i18n.translation import _ | |
37 |
|
37 | |||
38 | from kallithea.lib import helpers as h |
|
38 | from kallithea.lib import helpers as h | |
39 |
from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator |
|
39 | from kallithea.lib.auth import LoginRequired, HasPermissionAllDecorator | |
40 | AuthUser |
|
|||
41 | from kallithea.lib.base import BaseController, render |
|
40 | from kallithea.lib.base import BaseController, render | |
42 | from kallithea.model.forms import DefaultPermissionsForm |
|
41 | from kallithea.model.forms import DefaultPermissionsForm | |
43 | from kallithea.model.permission import PermissionModel |
|
42 | from kallithea.model.permission import PermissionModel |
@@ -39,8 +39,8 b' from pylons.i18n.translation import _, u' | |||||
39 | import kallithea |
|
39 | import kallithea | |
40 | from kallithea.lib import helpers as h |
|
40 | from kallithea.lib import helpers as h | |
41 | from kallithea.lib.compat import json |
|
41 | from kallithea.lib.compat import json | |
42 |
from kallithea.lib.auth import LoginRequired, |
|
42 | from kallithea.lib.auth import LoginRequired, \ | |
43 | HasRepoGroupPermissionAnyDecorator, HasRepoGroupPermissionAll,\ |
|
43 | HasRepoGroupPermissionAnyDecorator, HasRepoGroupPermissionAll, \ | |
44 | HasPermissionAll |
|
44 | HasPermissionAll | |
45 | from kallithea.lib.base import BaseController, render |
|
45 | from kallithea.lib.base import BaseController, render | |
46 | from kallithea.model.db import RepoGroup, Repository |
|
46 | from kallithea.model.db import RepoGroup, Repository |
@@ -36,11 +36,11 b' from pylons.i18n.translation import _' | |||||
36 | from sqlalchemy.sql.expression import func |
|
36 | from sqlalchemy.sql.expression import func | |
37 |
|
37 | |||
38 | from kallithea.lib import helpers as h |
|
38 | from kallithea.lib import helpers as h | |
39 |
from kallithea.lib.auth import LoginRequired, |
|
39 | from kallithea.lib.auth import LoginRequired, \ | |
40 |
HasRepoPermissionAllDecorator, NotAnonymous, HasPermissionAny, |
|
40 | HasRepoPermissionAllDecorator, NotAnonymous, HasPermissionAny, \ | |
41 |
|
|
41 | HasRepoPermissionAnyDecorator | |
42 | from kallithea.lib.base import BaseRepoController, render |
|
42 | from kallithea.lib.base import BaseRepoController, render | |
43 |
from kallithea.lib.utils import action_logger, |
|
43 | from kallithea.lib.utils import action_logger, jsonify | |
44 | from kallithea.lib.vcs import RepositoryError |
|
44 | from kallithea.lib.vcs import RepositoryError | |
45 | from kallithea.model.meta import Session |
|
45 | from kallithea.model.meta import Session | |
46 | from kallithea.model.db import User, Repository, UserFollowing, RepoGroup,\ |
|
46 | from kallithea.model.db import User, Repository, UserFollowing, RepoGroup,\ |
@@ -40,18 +40,18 b' from webob.exc import HTTPInternalServer' | |||||
40 |
|
40 | |||
41 | import kallithea |
|
41 | import kallithea | |
42 | from kallithea.lib import helpers as h |
|
42 | from kallithea.lib import helpers as h | |
43 | from kallithea.lib.exceptions import UserGroupsAssignedException,\ |
|
43 | from kallithea.lib.exceptions import UserGroupsAssignedException, \ | |
44 | RepoGroupAssignmentError |
|
44 | RepoGroupAssignmentError | |
45 | from kallithea.lib.utils2 import safe_unicode, safe_int |
|
45 | from kallithea.lib.utils2 import safe_unicode, safe_int | |
46 |
from kallithea.lib.auth import LoginRequired, |
|
46 | from kallithea.lib.auth import LoginRequired, \ | |
47 | HasUserGroupPermissionAnyDecorator, HasPermissionAnyDecorator |
|
47 | HasUserGroupPermissionAnyDecorator, HasPermissionAnyDecorator | |
48 | from kallithea.lib.base import BaseController, render |
|
48 | from kallithea.lib.base import BaseController, render | |
49 | from kallithea.model.scm import UserGroupList |
|
49 | from kallithea.model.scm import UserGroupList | |
50 | from kallithea.model.user_group import UserGroupModel |
|
50 | from kallithea.model.user_group import UserGroupModel | |
51 | from kallithea.model.repo import RepoModel |
|
51 | from kallithea.model.repo import RepoModel | |
52 | from kallithea.model.db import User, UserGroup, UserGroupToPerm,\ |
|
52 | from kallithea.model.db import User, UserGroup, UserGroupToPerm, \ | |
53 | UserGroupRepoToPerm, UserGroupRepoGroupToPerm |
|
53 | UserGroupRepoToPerm, UserGroupRepoGroupToPerm | |
54 | from kallithea.model.forms import UserGroupForm, UserGroupPermsForm,\ |
|
54 | from kallithea.model.forms import UserGroupForm, UserGroupPermsForm, \ | |
55 | CustomDefaultPermissionsForm |
|
55 | CustomDefaultPermissionsForm | |
56 | from kallithea.model.meta import Session |
|
56 | from kallithea.model.meta import Session | |
57 | from kallithea.lib.utils import action_logger |
|
57 | from kallithea.lib.utils import action_logger |
@@ -42,8 +42,7 b' from kallithea.lib.auth import LoginRequ' | |||||
42 | from kallithea.lib import diffs |
|
42 | from kallithea.lib import diffs | |
43 | from kallithea.model.db import Repository |
|
43 | from kallithea.model.db import Repository | |
44 | from kallithea.lib.diffs import LimitedDiffContainer |
|
44 | from kallithea.lib.diffs import LimitedDiffContainer | |
45 |
from kallithea.controllers.changeset import _ignorews_url, |
|
45 | from kallithea.controllers.changeset import _ignorews_url, _context_url | |
46 | _context_url, get_line_ctx, get_ignore_ws |
|
|||
47 | from kallithea.lib.graphmod import graph_data |
|
46 | from kallithea.lib.graphmod import graph_data | |
48 | from kallithea.lib.compat import json |
|
47 | from kallithea.lib.compat import json | |
49 |
|
48 |
@@ -40,8 +40,7 b' from kallithea.lib.helpers import Page' | |||||
40 | from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \ |
|
40 | from kallithea.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator, \ | |
41 | NotAnonymous, HasRepoPermissionAny, HasPermissionAnyDecorator, HasPermissionAny |
|
41 | NotAnonymous, HasRepoPermissionAny, HasPermissionAnyDecorator, HasPermissionAny | |
42 | from kallithea.lib.base import BaseRepoController, render |
|
42 | from kallithea.lib.base import BaseRepoController, render | |
43 |
from kallithea.model.db import Repository, |
|
43 | from kallithea.model.db import Repository, UserFollowing, User, Ui | |
44 | Ui |
|
|||
45 | from kallithea.model.repo import RepoModel |
|
44 | from kallithea.model.repo import RepoModel | |
46 | from kallithea.model.forms import RepoForkForm |
|
45 | from kallithea.model.forms import RepoForkForm | |
47 | from kallithea.model.scm import ScmModel, AvailableRepoGroupChoices |
|
46 | from kallithea.model.scm import ScmModel, AvailableRepoGroupChoices |
@@ -49,7 +49,7 b' from kallithea.lib.utils import action_l' | |||||
49 | from kallithea.lib.vcs.utils import safe_str |
|
49 | from kallithea.lib.vcs.utils import safe_str | |
50 | from kallithea.lib.vcs.exceptions import EmptyRepositoryError |
|
50 | from kallithea.lib.vcs.exceptions import EmptyRepositoryError | |
51 | from kallithea.lib.diffs import LimitedDiffContainer |
|
51 | from kallithea.lib.diffs import LimitedDiffContainer | |
52 |
from kallithea.model.db import |
|
52 | from kallithea.model.db import PullRequest, ChangesetStatus, ChangesetComment,\ | |
53 | PullRequestReviewers |
|
53 | PullRequestReviewers | |
54 | from kallithea.model.pull_request import PullRequestModel |
|
54 | from kallithea.model.pull_request import PullRequestModel | |
55 | from kallithea.model.meta import Session |
|
55 | from kallithea.model.meta import Session | |
@@ -58,8 +58,7 b' from kallithea.model.comment import Chan' | |||||
58 | from kallithea.model.changeset_status import ChangesetStatusModel |
|
58 | from kallithea.model.changeset_status import ChangesetStatusModel | |
59 | from kallithea.model.forms import PullRequestForm, PullRequestPostForm |
|
59 | from kallithea.model.forms import PullRequestForm, PullRequestPostForm | |
60 | from kallithea.lib.utils2 import safe_int |
|
60 | from kallithea.lib.utils2 import safe_int | |
61 |
from kallithea.controllers.changeset import _ignorews_url, |
|
61 | from kallithea.controllers.changeset import _ignorews_url, _context_url | |
62 | _context_url, get_line_ctx, get_ignore_ws |
|
|||
63 | from kallithea.controllers.compare import CompareController |
|
62 | from kallithea.controllers.compare import CompareController | |
64 | from kallithea.lib.graphmod import graph_data |
|
63 | from kallithea.lib.graphmod import graph_data | |
65 |
|
64 |
@@ -39,7 +39,7 b' from kallithea.lib.utils import ask_ok' | |||||
39 | from kallithea.model import init_model |
|
39 | from kallithea.model import init_model | |
40 | from kallithea.model.db import User, Permission, Ui, \ |
|
40 | from kallithea.model.db import User, Permission, Ui, \ | |
41 | Setting, UserToPerm, DbMigrateVersion, RepoGroup, \ |
|
41 | Setting, UserToPerm, DbMigrateVersion, RepoGroup, \ | |
42 |
UserRepoGroupToPerm, CacheInvalidation, |
|
42 | UserRepoGroupToPerm, CacheInvalidation, Repository | |
43 |
|
43 | |||
44 | from sqlalchemy.engine import create_engine |
|
44 | from sqlalchemy.engine import create_engine | |
45 | from kallithea.model.repo_group import RepoGroupModel |
|
45 | from kallithea.model.repo_group import RepoGroupModel |
@@ -48,7 +48,7 b' from kallithea.lib.vcs.utils.lazy import' | |||||
48 | from kallithea.lib.vcs.backends.base import EmptyChangeset |
|
48 | from kallithea.lib.vcs.backends.base import EmptyChangeset | |
49 |
|
49 | |||
50 | from kallithea.lib.utils2 import str2bool, safe_str, get_changeset_safe, \ |
|
50 | from kallithea.lib.utils2 import str2bool, safe_str, get_changeset_safe, \ | |
51 |
safe_unicode, remove_suffix, remove_prefix, time_to_datetime |
|
51 | safe_unicode, remove_suffix, remove_prefix, time_to_datetime | |
52 | from kallithea.lib.compat import json |
|
52 | from kallithea.lib.compat import json | |
53 | from kallithea.lib.caching_query import FromCache |
|
53 | from kallithea.lib.caching_query import FromCache | |
54 |
|
54 |
@@ -48,7 +48,7 b' from kallithea.lib.vcs.utils.lazy import' | |||||
48 | from kallithea.lib.vcs.backends.base import EmptyChangeset |
|
48 | from kallithea.lib.vcs.backends.base import EmptyChangeset | |
49 |
|
49 | |||
50 | from kallithea.lib.utils2 import str2bool, safe_str, get_changeset_safe, \ |
|
50 | from kallithea.lib.utils2 import str2bool, safe_str, get_changeset_safe, \ | |
51 |
safe_unicode |
|
51 | safe_unicode, remove_prefix, time_to_datetime | |
52 | from kallithea.lib.compat import json |
|
52 | from kallithea.lib.compat import json | |
53 | from kallithea.lib.caching_query import FromCache |
|
53 | from kallithea.lib.caching_query import FromCache | |
54 |
|
54 |
@@ -48,7 +48,7 b' from kallithea.lib.vcs.utils.lazy import' | |||||
48 | from kallithea.lib.vcs.backends.base import EmptyChangeset |
|
48 | from kallithea.lib.vcs.backends.base import EmptyChangeset | |
49 |
|
49 | |||
50 | from kallithea.lib.utils2 import str2bool, safe_str, get_changeset_safe, \ |
|
50 | from kallithea.lib.utils2 import str2bool, safe_str, get_changeset_safe, \ | |
51 |
safe_unicode |
|
51 | safe_unicode, remove_prefix, time_to_datetime | |
52 | from kallithea.lib.compat import json |
|
52 | from kallithea.lib.compat import json | |
53 | from kallithea.lib.caching_query import FromCache |
|
53 | from kallithea.lib.caching_query import FromCache | |
54 |
|
54 |
@@ -22,19 +22,19 b' def upgrade(migrate_engine):' | |||||
22 | #========================================================================== |
|
22 | #========================================================================== | |
23 | # Add table `changeset_comments` |
|
23 | # Add table `changeset_comments` | |
24 | #========================================================================== |
|
24 | #========================================================================== | |
25 |
from kallithea.lib.dbmigrate.schema.db_1_3_0 import |
|
25 | from kallithea.lib.dbmigrate.schema.db_1_3_0 import ChangesetComment | |
26 | ChangesetComment().__table__.create() |
|
26 | ChangesetComment().__table__.create() | |
27 |
|
27 | |||
28 | #========================================================================== |
|
28 | #========================================================================== | |
29 | # Add table `notifications` |
|
29 | # Add table `notifications` | |
30 | #========================================================================== |
|
30 | #========================================================================== | |
31 |
from kallithea.lib.dbmigrate.schema.db_1_3_0 import |
|
31 | from kallithea.lib.dbmigrate.schema.db_1_3_0 import Notification | |
32 | Notification().__table__.create() |
|
32 | Notification().__table__.create() | |
33 |
|
33 | |||
34 | #========================================================================== |
|
34 | #========================================================================== | |
35 | # Add table `user_to_notification` |
|
35 | # Add table `user_to_notification` | |
36 | #========================================================================== |
|
36 | #========================================================================== | |
37 |
from kallithea.lib.dbmigrate.schema.db_1_3_0 import |
|
37 | from kallithea.lib.dbmigrate.schema.db_1_3_0 import UserNotification | |
38 | UserNotification().__table__.create() |
|
38 | UserNotification().__table__.create() | |
39 |
|
39 | |||
40 | #========================================================================== |
|
40 | #========================================================================== |
@@ -50,11 +50,9 b' from kallithea.lib.vcs.utils.hgcompat im' | |||||
50 | from kallithea.lib.vcs.utils.helpers import get_scm |
|
50 | from kallithea.lib.vcs.utils.helpers import get_scm | |
51 | from kallithea.lib.vcs.exceptions import VCSError |
|
51 | from kallithea.lib.vcs.exceptions import VCSError | |
52 |
|
52 | |||
53 | from kallithea.lib.caching_query import FromCache |
|
|||
54 |
|
||||
55 | from kallithea.model import meta |
|
53 | from kallithea.model import meta | |
56 | from kallithea.model.db import Repository, User, Ui, \ |
|
54 | from kallithea.model.db import Repository, User, Ui, \ | |
57 |
UserLog, RepoGroup, Setting, |
|
55 | UserLog, RepoGroup, Setting, UserGroup | |
58 | from kallithea.model.meta import Session |
|
56 | from kallithea.model.meta import Session | |
59 | from kallithea.model.repo_group import RepoGroupModel |
|
57 | from kallithea.model.repo_group import RepoGroupModel | |
60 | from kallithea.lib.utils2 import safe_str, safe_unicode, get_current_authuser |
|
58 | from kallithea.lib.utils2 import safe_str, safe_unicode, get_current_authuser | |
@@ -407,7 +405,6 b' def set_vcs_config(config):' | |||||
407 |
|
405 | |||
408 | :param config: kallithea.CONFIG |
|
406 | :param config: kallithea.CONFIG | |
409 | """ |
|
407 | """ | |
410 | import kallithea |
|
|||
411 | from kallithea.lib.vcs import conf |
|
408 | from kallithea.lib.vcs import conf | |
412 | from kallithea.lib.utils2 import aslist |
|
409 | from kallithea.lib.utils2 import aslist | |
413 | conf.settings.BACKENDS = { |
|
410 | conf.settings.BACKENDS = { |
@@ -10,7 +10,7 b' from kallithea.lib.vcs.exceptions import' | |||||
10 | ChangesetDoesNotExistError, ImproperArchiveTypeError |
|
10 | ChangesetDoesNotExistError, ImproperArchiveTypeError | |
11 | ) |
|
11 | ) | |
12 | from kallithea.lib.vcs.nodes import ( |
|
12 | from kallithea.lib.vcs.nodes import ( | |
13 |
FileNode, DirNode, NodeKind, RootNode, |
|
13 | FileNode, DirNode, NodeKind, RootNode, SubModuleNode, | |
14 | ChangedFileNodesGenerator, AddedFileNodesGenerator, RemovedFileNodesGenerator |
|
14 | ChangedFileNodesGenerator, AddedFileNodesGenerator, RemovedFileNodesGenerator | |
15 | ) |
|
15 | ) | |
16 | from kallithea.lib.vcs.utils import ( |
|
16 | from kallithea.lib.vcs.utils import ( |
@@ -17,7 +17,6 b' import urllib' | |||||
17 | import urllib2 |
|
17 | import urllib2 | |
18 | import logging |
|
18 | import logging | |
19 | import posixpath |
|
19 | import posixpath | |
20 | import string |
|
|||
21 |
|
20 | |||
22 | from dulwich.objects import Tag |
|
21 | from dulwich.objects import Tag | |
23 | from dulwich.repo import Repo, NotGitRepository |
|
22 | from dulwich.repo import Repo, NotGitRepository |
@@ -29,7 +29,7 b' from kallithea.lib.vcs.utils.lazy import' | |||||
29 | from kallithea.lib.vcs.utils.ordered_dict import OrderedDict |
|
29 | from kallithea.lib.vcs.utils.ordered_dict import OrderedDict | |
30 | from kallithea.lib.vcs.utils.paths import abspath |
|
30 | from kallithea.lib.vcs.utils.paths import abspath | |
31 | from kallithea.lib.vcs.utils.hgcompat import ( |
|
31 | from kallithea.lib.vcs.utils.hgcompat import ( | |
32 |
ui, nullid, match, patch, diffopts, clone, get_contact, |
|
32 | ui, nullid, match, patch, diffopts, clone, get_contact, | |
33 | localrepository, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url, |
|
33 | localrepository, RepoLookupError, Abort, RepoError, hex, scmutil, hg_url, | |
34 | httpbasicauthhandler, httpdigestauthhandler, peer, httppeer, sshpeer |
|
34 | httpbasicauthhandler, httpdigestauthhandler, peer, httppeer, sshpeer | |
35 | ) |
|
35 | ) |
@@ -26,7 +26,6 b' Original author and date, and relevant c' | |||||
26 | """ |
|
26 | """ | |
27 |
|
27 | |||
28 | import logging |
|
28 | import logging | |
29 | from collections import defaultdict |
|
|||
30 | from sqlalchemy.orm import joinedload |
|
29 | from sqlalchemy.orm import joinedload | |
31 |
|
30 | |||
32 | from kallithea.model import BaseModel |
|
31 | from kallithea.model import BaseModel |
@@ -46,7 +46,6 b' from kallithea import DB_PREFIX' | |||||
46 | from kallithea.lib.exceptions import DefaultUserException |
|
46 | from kallithea.lib.exceptions import DefaultUserException | |
47 | from kallithea.lib.vcs import get_backend |
|
47 | from kallithea.lib.vcs import get_backend | |
48 | from kallithea.lib.vcs.utils.helpers import get_scm |
|
48 | from kallithea.lib.vcs.utils.helpers import get_scm | |
49 | from kallithea.lib.vcs.exceptions import VCSError |
|
|||
50 | from kallithea.lib.vcs.utils.lazy import LazyProperty |
|
49 | from kallithea.lib.vcs.utils.lazy import LazyProperty | |
51 | from kallithea.lib.vcs.backends.base import EmptyChangeset |
|
50 | from kallithea.lib.vcs.backends.base import EmptyChangeset | |
52 |
|
51 |
@@ -33,7 +33,7 b' import traceback' | |||||
33 | import shutil |
|
33 | import shutil | |
34 |
|
34 | |||
35 | from kallithea.lib.utils2 import safe_unicode, unique_id, safe_int, \ |
|
35 | from kallithea.lib.utils2 import safe_unicode, unique_id, safe_int, \ | |
36 |
time_to_datetime, |
|
36 | time_to_datetime, AttributeDict | |
37 | from kallithea.lib.compat import json |
|
37 | from kallithea.lib.compat import json | |
38 | from kallithea.model import BaseModel |
|
38 | from kallithea.model import BaseModel | |
39 | from kallithea.model.db import Gist |
|
39 | from kallithea.model.db import Gist |
@@ -45,8 +45,7 b' from kallithea.lib.hooks import log_dele' | |||||
45 | from kallithea.model import BaseModel |
|
45 | from kallithea.model import BaseModel | |
46 | from kallithea.model.db import Repository, UserRepoToPerm, UserGroupRepoToPerm, \ |
|
46 | from kallithea.model.db import Repository, UserRepoToPerm, UserGroupRepoToPerm, \ | |
47 | UserRepoGroupToPerm, UserGroupRepoGroupToPerm, User, Permission, \ |
|
47 | UserRepoGroupToPerm, UserGroupRepoGroupToPerm, User, Permission, \ | |
48 |
Statistics, UserGroup, |
|
48 | Statistics, UserGroup, Ui, RepoGroup, RepositoryField | |
49 | Setting, RepositoryField |
|
|||
50 |
|
49 | |||
51 | from kallithea.lib import helpers as h |
|
50 | from kallithea.lib import helpers as h | |
52 | from kallithea.lib.auth import HasRepoPermissionAny, HasUserGroupPermissionAny |
|
51 | from kallithea.lib.auth import HasRepoPermissionAny, HasUserGroupPermissionAny |
@@ -31,9 +31,8 b' from formencode.validators import (' | |||||
31 | from kallithea.lib.compat import OrderedSet |
|
31 | from kallithea.lib.compat import OrderedSet | |
32 | from kallithea.lib import ipaddr |
|
32 | from kallithea.lib import ipaddr | |
33 | from kallithea.lib.utils import repo_name_slug |
|
33 | from kallithea.lib.utils import repo_name_slug | |
34 |
from kallithea.lib.utils2 import |
|
34 | from kallithea.lib.utils2 import str2bool, aslist | |
35 |
from kallithea.model.db import RepoGroup, Repository, UserGroup, User |
|
35 | from kallithea.model.db import RepoGroup, Repository, UserGroup, User | |
36 | ChangesetStatus |
|
|||
37 | from kallithea.lib.exceptions import LdapImportError |
|
36 | from kallithea.lib.exceptions import LdapImportError | |
38 | from kallithea.config.routing import ADMIN_PREFIX |
|
37 | from kallithea.config.routing import ADMIN_PREFIX | |
39 | from kallithea.lib.auth import HasRepoGroupPermissionAny, HasPermissionAny |
|
38 | from kallithea.lib.auth import HasRepoGroupPermissionAny, HasPermissionAny |
@@ -1,5 +1,5 b'' | |||||
1 | from kallithea.tests import * |
|
1 | from kallithea.tests import * | |
2 |
from kallithea.model.db import |
|
2 | from kallithea.model.db import User | |
3 |
|
3 | |||
4 | from kallithea.model.user import UserModel |
|
4 | from kallithea.model.user import UserModel | |
5 | from kallithea.model.notification import NotificationModel |
|
5 | from kallithea.model.notification import NotificationModel |
@@ -13,7 +13,6 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 | from sqlalchemy.orm.exc import NoResultFound |
|
15 | from sqlalchemy.orm.exc import NoResultFound | |
16 | from webob.exc import HTTPNotFound |
|
|||
17 |
|
16 | |||
18 | from kallithea.tests import * |
|
17 | from kallithea.tests import * | |
19 | from kallithea.tests.fixture import Fixture |
|
18 | from kallithea.tests.fixture import Fixture |
@@ -2,7 +2,6 b'' | |||||
2 | from kallithea.tests import * |
|
2 | from kallithea.tests import * | |
3 | from kallithea.model.repo import RepoModel |
|
3 | from kallithea.model.repo import RepoModel | |
4 | from kallithea.model.meta import Session |
|
4 | from kallithea.model.meta import Session | |
5 | from kallithea.model.db import Repository |
|
|||
6 | from kallithea.tests.fixture import Fixture |
|
5 | from kallithea.tests.fixture import Fixture | |
7 |
|
6 | |||
8 | fixture = Fixture() |
|
7 | fixture = Fixture() |
@@ -5,7 +5,6 b' from kallithea.tests.fixture import Fixt' | |||||
5 | from kallithea.model.meta import Session |
|
5 | from kallithea.model.meta import Session | |
6 |
|
6 | |||
7 | from kallithea.controllers.pullrequests import PullrequestsController |
|
7 | from kallithea.controllers.pullrequests import PullrequestsController | |
8 | from kallithea.lib.exceptions import UserInvalidException |
|
|||
9 |
|
8 | |||
10 | fixture = Fixture() |
|
9 | fixture = Fixture() | |
11 |
|
10 |
@@ -2,7 +2,6 b' import mock' | |||||
2 |
|
2 | |||
3 | import kallithea |
|
3 | import kallithea | |
4 | from kallithea.tests import * |
|
4 | from kallithea.tests import * | |
5 | from kallithea.model.db import User |
|
|||
6 |
|
5 | |||
7 | class smtplib_mock(object): |
|
6 | class smtplib_mock(object): | |
8 |
|
7 |
@@ -8,8 +8,6 b' from kallithea.model.user_group import U' | |||||
8 |
|
8 | |||
9 | from kallithea.model.meta import Session |
|
9 | from kallithea.model.meta import Session | |
10 | from kallithea.model.repo_group import RepoGroupModel |
|
10 | from kallithea.model.repo_group import RepoGroupModel | |
11 | from kallithea.model.db import ChangesetStatus, ChangesetComment, Repository |
|
|||
12 | from kallithea.model.changeset_status import ChangesetStatusModel |
|
|||
13 | from kallithea.tests.fixture import Fixture |
|
11 | from kallithea.tests.fixture import Fixture | |
14 |
|
12 | |||
15 | fixture = Fixture() |
|
13 | fixture = Fixture() |
General Comments 0
You need to be logged in to leave comments.
Login now