diff --git a/pagure/forms.py b/pagure/forms.py index 98825ba..40b6260 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -158,6 +158,7 @@ class AddPullRequestCommentForm(wtf.Form): [wtforms.validators.Required()] ) + class AddPullRequestFlagForm(wtf.Form): ''' Form to add a flag to a pull-request. ''' username = wtforms.TextField( diff --git a/pagure/hooks/files/fedmsg_hook.py b/pagure/hooks/files/fedmsg_hook.py index 60b9352..f837fa4 100755 --- a/pagure/hooks/files/fedmsg_hook.py +++ b/pagure/hooks/files/fedmsg_hook.py @@ -94,7 +94,7 @@ for line in sys.stdin.readlines(): path=abspath, username=username, repo=project.to_json(public=True) - if not isinstance(project, basestring) else project, + if not isinstance(project, basestring) else project, branch=refname, agent=os.getlogin(), ) diff --git a/pagure/hooks/files/pagure_hook_tickets.py b/pagure/hooks/files/pagure_hook_tickets.py index 7a7d320..240b4fe 100755 --- a/pagure/hooks/files/pagure_hook_tickets.py +++ b/pagure/hooks/files/pagure_hook_tickets.py @@ -56,7 +56,6 @@ def run_as_post_receive_hook(): print ' -- Ref name' print refname - if set(newrev) == set(['0']): print "Deleting a reference/branch, so we won't run the "\ "pagure hook" diff --git a/pagure/lib/model.py b/pagure/lib/model.py index b9a35d0..ec24e4c 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -346,7 +346,7 @@ class Project(BASE): 'name': self.name, 'description': self.description, 'parent': self.parent.to_json(public=public, api=api) - if self.parent else None, + if self.parent else None, 'date_created': self.date_created.strftime('%s'), 'user': self.user.to_json(public=public), } @@ -749,7 +749,7 @@ class PullRequest(BASE): 'date_created': self.date_created.strftime('%s'), 'user': self.user.to_json(public=public), 'assignee': self.assignee.to_json(public=public) - if self.assignee else None, + if self.assignee else None, 'status': self.status, 'commit_start': self.commit_start, 'commit_stop': self.commit_stop, diff --git a/pagure/ui/filters.py b/pagure/ui/filters.py index fe6e79f..8fa2c44 100644 --- a/pagure/ui/filters.py +++ b/pagure/ui/filters.py @@ -302,7 +302,6 @@ def no_js(content): return content - @APP.template_filter('toRGB') def int_to_rgb(percent): """ Template filter converting a given percentage to a css RGB value. diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 3f25ac1..8b18e00 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -596,10 +596,12 @@ def fork_project(repo, username=None): methods=('GET', 'POST')) @APP.route('//diff/..', methods=('GET', 'POST')) -@APP.route('/fork///diff/../', - methods=('GET', 'POST')) -@APP.route('/fork///diff/..', - methods=('GET', 'POST')) +@APP.route( + '/fork///diff/../', + methods=('GET', 'POST')) +@APP.route( + '/fork///diff/..', + methods=('GET', 'POST')) @cla_required def new_request_pull(repo, branch_to, branch_from, username=None): """ Request pulling the changes from the fork into the project.