From 3caaa0538c0816305309829e27ec6b03ecbe0dd2 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: May 22 2017 20:36:59 +0000 Subject: Flake8 fixes Signed-off-by: Patrick Uiterwijk --- diff --git a/pagure/hooks/files/default_hook.py b/pagure/hooks/files/default_hook.py index b51b77a..ab73492 100755 --- a/pagure/hooks/files/default_hook.py +++ b/pagure/hooks/files/default_hook.py @@ -11,8 +11,6 @@ import sys import pygit2 -from sqlalchemy.exc import SQLAlchemyError - if 'PAGURE_CONFIG' not in os.environ \ and os.path.exists('/etc/pagure/pagure.cfg'): os.environ['PAGURE_CONFIG'] = '/etc/pagure/pagure.cfg' diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index df3a339..51e8984 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -26,7 +26,6 @@ import hashlib import logging import markdown import os -import shutil import tempfile import subprocess import urlparse @@ -44,8 +43,6 @@ from sqlalchemy.orm import aliased from sqlalchemy.orm import sessionmaker from sqlalchemy.orm import scoped_session -import pygit2 - import pagure import pagure.exceptions import pagure.lib.git @@ -91,6 +88,8 @@ def get_user(session, key): SESSIONMAKER = None + + def create_session(db_url=None, debug=False, pool_recycle=3600): ''' Create the Session object to use to query the database. @@ -118,7 +117,7 @@ def create_session(db_url=None, debug=False, pool_recycle=3600): SESSIONMAKER = sessionmaker(bind=engine) scopedsession = scoped_session(SESSIONMAKER) - # model.BASE.metadata.bind = scopedsession + model.BASE.metadata.bind = scopedsession return scopedsession @@ -1729,7 +1728,7 @@ def update_user_settings(session, settings, user): update.append(key) new_settings[key] = settings[key] else: - if new_settings[key] != False: + if new_settings[key] is not False: update.append(key) new_settings[key] = False @@ -1747,7 +1746,6 @@ def fork_project(session, user, repo, gitfolder, docfolder, ticketfolder, requestfolder, editbranch=None, editfile=None): ''' Fork a given project into the user's forks. ''' - reponame = os.path.join(gitfolder, repo.path) forkreponame = '%s.git' % os.path.join( gitfolder, 'forks', user, repo.namespace if repo.namespace else '', repo.name) diff --git a/pagure/lib/git.py b/pagure/lib/git.py index 18a8522..2a9abe2 100644 --- a/pagure/lib/git.py +++ b/pagure/lib/git.py @@ -15,7 +15,6 @@ # pylint: disable=too-many-lines import datetime -import hashlib import json import logging import os @@ -207,7 +206,6 @@ def _generate_gitolite_acls(): def update_git(obj, repo, repofolder): """ Schedules an update_repo task after determining arguments. """ - user = None ticketuid = None requestuid = None if obj.isa == 'issue': diff --git a/pagure/lib/tasks.py b/pagure/lib/tasks.py index cbdf53d..59ac0c4 100644 --- a/pagure/lib/tasks.py +++ b/pagure/lib/tasks.py @@ -51,7 +51,8 @@ def generate_gitolite_acls(): @conn.task -def create_project(username, namespace, name, add_readme, ignore_existing_repo): +def create_project(username, namespace, name, add_readme, + ignore_existing_repo): session = pagure.lib.create_session() project = pagure.lib._get_project(session, namespace=namespace, @@ -302,9 +303,6 @@ def pull_remote_repo(name, namespace, user, remote_git, branch_from, branch_to): session = pagure.lib.create_session() - project = pagure.lib._get_project(session, namespace=namespace, - name=name, user=user) - clonepath = pagure.get_remote_repo_path(remote_git, branch_from, ignore_non_exist=True) pygit2.clone_repository( @@ -324,6 +322,7 @@ def refresh_pr_cache(name, namespace, user): session.remove() + @conn.task def merge_pull_request(name, namespace, user, requestid, user_merger): session = pagure.lib.create_session() diff --git a/pagure/ui/app.py b/pagure/ui/app.py index 84c98cc..a771613 100644 --- a/pagure/ui/app.py +++ b/pagure/ui/app.py @@ -501,6 +501,7 @@ def wait_task(taskid): 'waiting.html', taskid=taskid) + @APP.route('/settings/', methods=('GET', 'POST')) @APP.route('/settings', methods=('GET', 'POST')) @login_required