# HG changeset patch # User Søren Løvborg # Date 1470236517 -7200 # Node ID 3d1fcf67f299471d721be319d04af19959506e36 # Parent 974d6470cbec64bf6fc9840047a21f3f0a0a4cac model: drop BaseModel.cls It no longer serves a purpose. diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/__init__.py --- a/kallithea/model/__init__.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/__init__.py Wed Aug 03 17:01:57 2016 +0200 @@ -72,8 +72,6 @@ :param sa: If passed it reuses this session instead of creating a new one """ - cls = None # override in child class - def __init__(self, sa=None): if sa is not None: self.sa = sa diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/api_key.py --- a/kallithea/model/api_key.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/api_key.py Wed Aug 03 17:01:57 2016 +0200 @@ -38,7 +38,6 @@ class ApiKeyModel(BaseModel): - cls = UserApiKeys def create(self, user, description, lifetime=-1): """ diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/changeset_status.py --- a/kallithea/model/changeset_status.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/changeset_status.py Wed Aug 03 17:01:57 2016 +0200 @@ -37,8 +37,6 @@ class ChangesetStatusModel(BaseModel): - cls = ChangesetStatus - def _get_status_query(self, repo, revision, pull_request, with_revisions=False): repo = self._get_repo(repo) diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/comment.py --- a/kallithea/model/comment.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/comment.py Wed Aug 03 17:01:57 2016 +0200 @@ -43,8 +43,6 @@ class ChangesetCommentsModel(BaseModel): - cls = ChangesetComment - def _get_notification_data(self, repo, comment, user, comment_text, line_no=None, revision=None, pull_request=None, status_change=None, closing_pr=False): diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/gist.py --- a/kallithea/model/gist.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/gist.py Wed Aug 03 17:01:57 2016 +0200 @@ -46,7 +46,6 @@ class GistModel(BaseModel): - cls = Gist def _get_gist(self, gist): """ diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/notification.py --- a/kallithea/model/notification.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/notification.py Wed Aug 03 17:01:57 2016 +0200 @@ -45,8 +45,6 @@ class NotificationModel(BaseModel): - cls = Notification - def create(self, created_by, subject, body, recipients=None, type_=Notification.TYPE_MESSAGE, with_email=True, email_kwargs=None, repo_name=None): diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/permission.py --- a/kallithea/model/permission.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/permission.py Wed Aug 03 17:01:57 2016 +0200 @@ -44,8 +44,6 @@ Permissions model for Kallithea """ - cls = Permission - def create_permissions(self): """ Create permissions for whole system diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/pull_request.py --- a/kallithea/model/pull_request.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/pull_request.py Wed Aug 03 17:01:57 2016 +0200 @@ -47,8 +47,6 @@ class PullRequestModel(BaseModel): - cls = PullRequest - def get_pullrequest_cnt_for_user(self, user): return PullRequest.query() \ .join(PullRequestReviewers) \ diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/repo.py --- a/kallithea/model/repo.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/repo.py Wed Aug 03 17:01:57 2016 +0200 @@ -56,7 +56,6 @@ class RepoModel(BaseModel): - cls = Repository URL_SEPARATOR = Repository.url_sep() def _get_user_group(self, users_group): diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/repo_group.py --- a/kallithea/model/repo_group.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/repo_group.py Wed Aug 03 17:01:57 2016 +0200 @@ -43,8 +43,6 @@ class RepoGroupModel(BaseModel): - cls = RepoGroup - def _get_user_group(self, users_group): return self._get_instance(UserGroup, users_group, callback=UserGroup.get_by_group_name) diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/repo_permission.py --- a/kallithea/model/repo_permission.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/repo_permission.py Wed Aug 03 17:01:57 2016 +0200 @@ -33,8 +33,6 @@ class RepositoryPermissionModel(BaseModel): - cls = UserRepoToPerm - def get_user_permission(self, repository, user): repository = self._get_repo(repository) user = self._get_user(user) diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/user.py --- a/kallithea/model/user.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/user.py Wed Aug 03 17:01:57 2016 +0200 @@ -54,8 +54,6 @@ class UserModel(BaseModel): password_reset_token_lifetime = 86400 # 24 hours - cls = User - def get(self, user_id, cache=False): user = self.sa.query(User) if cache: diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/model/user_group.py --- a/kallithea/model/user_group.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/model/user_group.py Wed Aug 03 17:01:57 2016 +0200 @@ -39,8 +39,6 @@ class UserGroupModel(BaseModel): - cls = UserGroup - def _get_user_group(self, user_group): return self._get_instance(UserGroup, user_group, callback=UserGroup.get_by_group_name) diff -r 974d6470cbec -r 3d1fcf67f299 kallithea/tests/fixture.py --- a/kallithea/tests/fixture.py Wed Aug 03 16:51:34 2016 +0200 +++ b/kallithea/tests/fixture.py Wed Aug 03 17:01:57 2016 +0200 @@ -237,7 +237,7 @@ form_data = { 'description': u'new-gist', 'owner': TEST_USER_ADMIN_LOGIN, - 'gist_type': GistModel.cls.GIST_PUBLIC, + 'gist_type': Gist.GIST_PUBLIC, 'lifetime': -1, 'gist_mapping': {'filename1.txt':{'content':'hello world'},} }