diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index f18e577..ef279c4 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -1989,15 +1989,15 @@ def search_projects( # project is viewing the project elif isinstance(private, basestring) and private != username: projects = projects.filter( - sqlalchemy.or_( - model.Project.private == False, - sqlalchemy.and_( - model.User.user == private, - model.User.id == model.ProjectUser.user_id, - model.ProjectUser.project_id == model.Project.id, - model.Project.private == True, - ) + sqlalchemy.or_( + model.Project.private == False, + sqlalchemy.and_( + model.User.user == private, + model.User.id == model.ProjectUser.user_id, + model.ProjectUser.project_id == model.Project.id, + model.Project.private == True, ) + ) ) if fork is not None: @@ -3389,7 +3389,7 @@ def text2markdown(text, extended=True, readme=False): md_processor = markdown.Markdown( safe_mode="escape", extensions=extensions, - extension_configs = { + extension_configs={ 'markdown.extensions.codehilite': { 'guess_lang': False, } @@ -3460,7 +3460,7 @@ def clean_input(text, ignore=None): pass bleach_v[idx] = val if tuple(bleach_v) >= (1, 5, 0): - protocols=bleach.ALLOWED_PROTOCOLS + ['irc', 'ircs'] + protocols = bleach.ALLOWED_PROTOCOLS + ['irc', 'ircs'] kwargs['protocols'] = protocols return bleach.clean(text, **kwargs) diff --git a/pagure/lib/git.py b/pagure/lib/git.py index affa5e6..d4f7e00 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -709,7 +709,7 @@ def update_request_from_git( """ repo = pagure.lib._get_project( - session, reponame, user=username, namespace=namespace) + session, reponame, user=username, namespace=namespace) if not repo: raise pagure.exceptions.PagureException( 'Unknown repo %s of username: %s in namespace: %s' % ( @@ -882,7 +882,8 @@ def add_file_to_git(repo, issue, ticketfolder, user, filename, filestream): 'refs/heads/master', author, author, - 'Add file %s to ticket %s: %s' % (filename, issue.uid, issue.title), + 'Add file %s to ticket %s: %s' % ( + filename, issue.uid, issue.title), new_repo.index.write_tree(), parents) index.write() @@ -1484,7 +1485,6 @@ def diff_pull_request( """ - commitid = None diff = None diff_commits = [] diff, diff_commits, _ = get_diff_info( @@ -1647,6 +1647,6 @@ def reinit_git(project, repofolder): # create it again pygit2.init_repository( - repo_path, bare=True, - mode=pygit2.C.GIT_REPOSITORY_INIT_SHARED_GROUP + repo_path, bare=True, + mode=pygit2.C.GIT_REPOSITORY_INIT_SHARED_GROUP ) diff --git a/pagure/lib/model.py b/pagure/lib/model.py index c60bb90..7530d70 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -909,8 +909,10 @@ class DeployKey(BASE): project = relation( 'Project', foreign_keys=[project_id], remote_side=[Project.id], backref=backref( - 'deploykeys', cascade="delete, delete-orphan", single_parent=True) + 'deploykeys', cascade="delete, delete-orphan", + single_parent=True ) + ) creator_user = relation( 'User', @@ -1060,8 +1062,9 @@ class Issue(BASE): attachments.append( (link, filename, display_name, comment.date_created.strftime( - '%Y-%m-%d %H:%M:%S'), - str(comment.id))) + '%Y-%m-%d %H:%M:%S'), + str(comment.id)) + ) return attachments @property @@ -1286,8 +1289,10 @@ class IssueKeys(BASE): project = relation( 'Project', foreign_keys=[project_id], remote_side=[Project.id], backref=backref( - 'issue_keys', cascade="delete, delete-orphan", single_parent=True) + 'issue_keys', cascade="delete, delete-orphan", + single_parent=True ) + ) @property def data(self): @@ -1333,8 +1338,9 @@ class IssueValues(BASE): backref=backref( 'other_fields', cascade="delete, delete-orphan", - single_parent=True) + single_parent=True ) + ) key = relation( 'IssueKeys', foreign_keys=[key_id], remote_side=[IssueKeys.id], @@ -1381,8 +1387,9 @@ class TagIssue(BASE): issue = relation( 'Issue', foreign_keys=[issue_uid], remote_side=[Issue.uid], backref=backref( - 'old_tags', cascade="delete, delete-orphan", single_parent=True) + 'old_tags', cascade="delete, delete-orphan", single_parent=True ) + ) def __repr__(self): return 'TagIssue(issue:%s, tag:%s)' % (self.issue.id, self.tag) @@ -1489,8 +1496,9 @@ class TagProject(BASE): project = relation( 'Project', foreign_keys=[project_id], remote_side=[Project.id], backref=backref( - 'tags', cascade="delete, delete-orphan", single_parent=True) + 'tags', cascade="delete, delete-orphan", single_parent=True ) + ) def __repr__(self): return 'TagProject(project:%s, tag:%s)' % (