Mercurial > kallithea
changeset 6115:f4c712ab3e40
model: inline superfluous "helper" methods
__get_changeset_status wasn't even used and has simply been removed.
Notification.__get_notification reimplemented BaseModel._get_instance,
warts and all, and has been replaced by calls to that method.
The rest were just needless indirection, and have been inlined.
| author | Søren Løvborg <sorenl@unity3d.com> |
|---|---|
| date | Wed, 03 Aug 2016 16:16:38 +0200 |
| parents | 27e6594645f1 |
| children | 1e52ed5c37aa |
| files | kallithea/model/changeset_status.py kallithea/model/comment.py kallithea/model/notification.py kallithea/model/pull_request.py |
| diffstat | 4 files changed, 11 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/model/changeset_status.py Tue Aug 02 17:24:25 2016 +0200 +++ b/kallithea/model/changeset_status.py Wed Aug 03 16:16:38 2016 +0200 @@ -39,12 +39,6 @@ cls = ChangesetStatus - def __get_changeset_status(self, changeset_status): - return self._get_instance(ChangesetStatus, changeset_status) - - def __get_pull_request(self, pull_request): - return self._get_instance(PullRequest, pull_request) - def _get_status_query(self, repo, revision, pull_request, with_revisions=False): repo = self._get_repo(repo) @@ -58,7 +52,7 @@ if revision: q = q.filter(ChangesetStatus.revision == revision) elif pull_request: - pull_request = self.__get_pull_request(pull_request) + pull_request = self._get_instance(PullRequest, pull_request) q = q.filter(ChangesetStatus.pull_request == pull_request) else: raise Exception('Please specify revision or pull_request') @@ -167,7 +161,7 @@ revisions = [revision] else: assert pull_request is not None - pull_request = self.__get_pull_request(pull_request) + pull_request = self._get_instance(PullRequest, pull_request) repo = pull_request.org_repo q = q.filter(ChangesetStatus.repo == repo) q = q.filter(ChangesetStatus.revision.in_(pull_request.revisions))
--- a/kallithea/model/comment.py Tue Aug 02 17:24:25 2016 +0200 +++ b/kallithea/model/comment.py Wed Aug 03 16:16:38 2016 +0200 @@ -45,12 +45,6 @@ cls = ChangesetComment - def __get_changeset_comment(self, changeset_comment): - return self._get_instance(ChangesetComment, changeset_comment) - - def __get_pull_request(self, pull_request): - return self._get_instance(PullRequest, pull_request) - def _get_notification_data(self, repo, comment, user, comment_text, line_no=None, revision=None, pull_request=None, status_change=None, closing_pr=False): @@ -186,7 +180,7 @@ if revision is not None: comment.revision = revision elif pull_request is not None: - pull_request = self.__get_pull_request(pull_request) + pull_request = self._get_instance(PullRequest, pull_request) comment.pull_request = pull_request else: raise Exception('Please specify revision or pull_request_id') @@ -227,7 +221,7 @@ return comment def delete(self, comment): - comment = self.__get_changeset_comment(comment) + comment = self._get_instance(ChangesetComment, comment) Session().delete(comment) return comment @@ -272,7 +266,7 @@ q = q.filter(ChangesetComment.revision == revision) \ .filter(ChangesetComment.repo_id == repo_id) elif pull_request is not None: - pull_request = self.__get_pull_request(pull_request) + pull_request = self._get_instance(PullRequest, pull_request) q = q.filter(ChangesetComment.pull_request == pull_request) else: raise Exception('Please specify either revision or pull_request')
--- a/kallithea/model/notification.py Tue Aug 02 17:24:25 2016 +0200 +++ b/kallithea/model/notification.py Wed Aug 03 16:16:38 2016 +0200 @@ -47,16 +47,6 @@ cls = Notification - def __get_notification(self, notification): - if isinstance(notification, Notification): - return notification - elif isinstance(notification, (int, long)): - return Notification.get(notification) - else: - if notification is not None: - raise Exception('notification must be int, long or Instance' - ' of Notification got %s' % type(notification)) - def create(self, created_by, subject, body, recipients=None, type_=Notification.TYPE_MESSAGE, with_email=True, email_kwargs=None, repo_name=None): @@ -152,7 +142,7 @@ def delete(self, user, notification): # we don't want to remove actual notification just the assignment try: - notification = self.__get_notification(notification) + notification = self._get_instance(Notification, notification) user = self._get_user(user) if notification and user: obj = UserNotification.query() \ @@ -190,7 +180,7 @@ def mark_read(self, user, notification): try: - notification = self.__get_notification(notification) + notification = self._get_instance(Notification, notification) user = self._get_user(user) if notification and user: obj = UserNotification.query() \ @@ -235,7 +225,7 @@ def get_user_notification(self, user, notification): user = self._get_user(user) - notification = self.__get_notification(notification) + notification = self._get_instance(Notification, notification) return UserNotification.query() \ .filter(UserNotification.notification == notification) \
--- a/kallithea/model/pull_request.py Tue Aug 02 17:24:25 2016 +0200 +++ b/kallithea/model/pull_request.py Wed Aug 03 16:16:38 2016 +0200 @@ -49,9 +49,6 @@ cls = PullRequest - def __get_pull_request(self, pull_request): - return self._get_instance(PullRequest, pull_request) - def get_pullrequest_cnt_for_user(self, user): return PullRequest.query() \ .join(PullRequestReviewers) \ @@ -202,7 +199,7 @@ def update_reviewers(self, user, pull_request, reviewers_ids): reviewers_ids = set(reviewers_ids) - pull_request = self.__get_pull_request(pull_request) + pull_request = self._get_instance(PullRequest, pull_request) current_reviewers = PullRequestReviewers.query() \ .options(joinedload('user')) \ .filter_by(pull_request=pull_request) \ @@ -225,11 +222,11 @@ Session().delete(prr) def delete(self, pull_request): - pull_request = self.__get_pull_request(pull_request) + pull_request = self._get_instance(PullRequest, pull_request) Session().delete(pull_request) def close_pull_request(self, pull_request): - pull_request = self.__get_pull_request(pull_request) + pull_request = self._get_instance(PullRequest, pull_request) pull_request.status = PullRequest.STATUS_CLOSED pull_request.updated_on = datetime.datetime.now() Session().add(pull_request)