From 7407c042034c576c6daaffa77a6818ee6a6fee81 Mon Sep 17 00:00:00 2001 From: Pierre-Yves Chibon Date: Feb 28 2015 11:41:57 +0000 Subject: pep8 clean up of progit.lib --- diff --git a/progit/lib/__init__.py b/progit/lib/__init__.py index 790e367..24af449 100644 --- a/progit/lib/__init__.py +++ b/progit/lib/__init__.py @@ -482,7 +482,7 @@ def update_project_settings(session, repo, issue_tracker, project_docs): def fork_project(session, user, repo, gitfolder, - forkfolder, docfolder,ticketfolder): + forkfolder, docfolder, ticketfolder): ''' Fork a given project into the user's forks. ''' if repo.is_fork: reponame = os.path.join(forkfolder, repo.path) @@ -677,10 +677,10 @@ def search_issues( ) if author is not None: query = query.filter( - model.Issue.user_id == model.User.id - ).filter( - model.User.user == author - ) + model.Issue.user_id == model.User.id + ).filter( + model.User.user == author + ) if issueid is not None: output = query.first() @@ -848,7 +848,8 @@ def avatar_url_from_openid(openid, size=64, default='retro', dns=False): default=default, ) else: - import urllib, hashlib + import urllib + import hashlib query = urllib.urlencode({'s': size, 'd': default}) hash = hashlib.sha256(openid).hexdigest() return "https://seccdn.libravatar.org/avatar/%s?%s" % (hash, query) diff --git a/progit/lib/login.py b/progit/lib/login.py index 94b9e94..f7fa6d8 100644 --- a/progit/lib/login.py +++ b/progit/lib/login.py @@ -27,7 +27,6 @@ def id_generator(size=15, chars=string.ascii_uppercase + string.digits): return ''.join(random.choice(chars) for x in range(size)) - def get_session_by_visitkey(session, sessionid): ''' Return a specified VisitUser via its session identifier (visit_key). diff --git a/progit/lib/notify.py b/progit/lib/notify.py index 03a1bfb..f59902e 100644 --- a/progit/lib/notify.py +++ b/progit/lib/notify.py @@ -71,13 +71,13 @@ New comment: %s """ % ( - comment.user.user, - comment.comment, - '%s/%s/issue/%s' % ( - progit.APP.config['APP_URL'], - comment.issue.project.name, - comment.issue.id, - ), + comment.user.user, + comment.comment, + '%s/%s/issue/%s' % ( + progit.APP.config['APP_URL'], + comment.issue.project.name, + comment.issue.id, + ), ) mail_to = set([cmt.user.emails[0].email for cmt in comment.issue.comments]) mail_to.add(comment.issue.project.user.emails[0].email) @@ -106,14 +106,14 @@ New issue: %s """ % ( - issue.user.user, - issue.project.name, - issue.content, - '%s/%s/issue/%s' % ( - progit.APP.config['APP_URL'], + issue.user.user, issue.project.name, - issue.id, - ), + issue.content, + '%s/%s/issue/%s' % ( + progit.APP.config['APP_URL'], + issue.project.name, + issue.id, + ), ) mail_to = set([cmt.user.emails[0].email for cmt in issue.comments]) mail_to.add(issue.project.user.emails[0].email) @@ -142,15 +142,15 @@ The issue: `%s` of project: `%s` has been %s by %s. %s """ % ( - issue.title, - issue.project.name, - action, - username, - '%s/%s/issue/%s' % ( - progit.APP.config['APP_URL'], + issue.title, issue.project.name, - issue.id, - ), + action, + username, + '%s/%s/issue/%s' % ( + progit.APP.config['APP_URL'], + issue.project.name, + issue.id, + ), ) mail_to = set([cmt.user.emails[0].email for cmt in issue.comments]) mail_to.add(issue.project.user.emails[0].email) @@ -182,14 +182,14 @@ New pull-request: %s """ % ( - request.user.user, - request.repo.name, - request.title, - '%s/%s/request-pull/%s' % ( - progit.APP.config['APP_URL'], + request.user.user, request.repo.name, - request.id, - ), + request.title, + '%s/%s/request-pull/%s' % ( + progit.APP.config['APP_URL'], + request.repo.name, + request.id, + ), ) mail_to = set([cmt.user.emails[0].email for cmt in request.comments]) mail_to.add(request.repo.user.emails[0].email) @@ -220,14 +220,14 @@ Merged pull-request: %s """ % ( - user.username, - request.repo.name, - request.title, - '%s/%s/request-pull/%s' % ( - progit.APP.config['APP_URL'], + user.username, request.repo.name, - request.id, - ), + request.title, + '%s/%s/request-pull/%s' % ( + progit.APP.config['APP_URL'], + request.repo.name, + request.id, + ), ) mail_to = set([cmt.user.emails[0].email for cmt in request.comments]) mail_to.add(request.repo.user.emails[0].email) @@ -258,14 +258,14 @@ Cancelled pull-request: %s """ % ( - user.username, - request.repo.name, - request.title, - '%s/%s/request-pull/%s' % ( - progit.APP.config['APP_URL'], + user.username, request.repo.name, - request.id, - ), + request.title, + '%s/%s/request-pull/%s' % ( + progit.APP.config['APP_URL'], + request.repo.name, + request.id, + ), ) mail_to = set([cmt.user.emails[0].email for cmt in request.comments]) mail_to.add(request.repo.user.emails[0].email)