Browse Source

Run isort on the pagure code

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>
Pierre-Yves Chibon 1 year ago
parent
commit
dd8c24ff55
71 changed files with 290 additions and 346 deletions
  1. 1 2
      pagure/__init__.py
  2. 11 11
      pagure/api/__init__.py
  3. 6 11
      pagure/api/boards.py
  4. 3 5
      pagure/api/ci/jenkins.py
  5. 10 11
      pagure/api/fork.py
  6. 2 2
      pagure/api/group.py
  7. 15 15
      pagure/api/issue.py
  8. 7 8
      pagure/api/plugins.py
  9. 8 10
      pagure/api/project.py
  10. 2 2
      pagure/api/user.py
  11. 4 8
      pagure/api/utils.py
  12. 4 5
      pagure/cli/admin.py
  13. 2 1
      pagure/config.py
  14. 4 2
      pagure/decorators.py
  15. 2 3
      pagure/default_config.py
  16. 5 4
      pagure/doc_utils.py
  17. 2 3
      pagure/docs_server.py
  18. 1 1
      pagure/exceptions.py
  19. 5 6
      pagure/flask_app.py
  20. 2 2
      pagure/forms.py
  21. 4 4
      pagure/hooks/__init__.py
  22. 1 2
      pagure/hooks/default.py
  23. 3 3
      pagure/hooks/fedmsg_hook.py
  24. 4 4
      pagure/hooks/irc.py
  25. 6 5
      pagure/hooks/mail.py
  26. 3 4
      pagure/hooks/mirror_hook.py
  27. 3 3
      pagure/hooks/pagure_ci.py
  28. 3 3
      pagure/hooks/pagure_force_commit.py
  29. 4 5
      pagure/hooks/pagure_hook.py
  30. 3 3
      pagure/hooks/pagure_no_new_branches.py
  31. 3 3
      pagure/hooks/pagure_request_hook.py
  32. 3 3
      pagure/hooks/pagure_ticket_hook.py
  33. 3 4
      pagure/hooks/pagure_unsigned_commits.py
  34. 4 4
      pagure/hooks/rtd.py
  35. 3 5
      pagure/internal/__init__.py
  36. 3 3
      pagure/lib/encoding_utils.py
  37. 12 15
      pagure/lib/git.py
  38. 2 3
      pagure/lib/git_auth.py
  39. 2 2
      pagure/lib/lib_ci.py
  40. 3 3
      pagure/lib/link.py
  41. 4 3
      pagure/lib/login.py
  42. 2 2
      pagure/lib/mimetype.py
  43. 14 14
      pagure/lib/model.py
  44. 2 4
      pagure/lib/model_base.py
  45. 9 10
      pagure/lib/notify.py
  46. 1 1
      pagure/lib/plugins.py
  47. 4 7
      pagure/lib/query.py
  48. 1 2
      pagure/lib/repo.py
  49. 3 4
      pagure/lib/tasks.py
  50. 2 3
      pagure/lib/tasks_mirror.py
  51. 3 4
      pagure/lib/tasks_services.py
  52. 1 1
      pagure/lib/tasks_utils.py
  53. 1 1
      pagure/login_forms.py
  54. 2 3
      pagure/mail_logging.py
  55. 3 4
      pagure/perfrepo.py
  56. 3 5
      pagure/pfmarkdown.py
  57. 1 1
      pagure/proxy.py
  58. 5 4
      pagure/ui/__init__.py
  59. 4 5
      pagure/ui/app.py
  60. 5 9
      pagure/ui/boards.py
  61. 3 3
      pagure/ui/clone.py
  62. 3 4
      pagure/ui/fas_login.py
  63. 5 7
      pagure/ui/filters.py
  64. 4 5
      pagure/ui/fork.py
  65. 1 2
      pagure/ui/groups.py
  66. 7 9
      pagure/ui/issues.py
  67. 5 6
      pagure/ui/login.py
  68. 3 4
      pagure/ui/oidc_login.py
  69. 2 4
      pagure/ui/plugins.py
  70. 14 16
      pagure/ui/repo.py
  71. 5 6
      pagure/utils.py

+ 1 - 2
pagure/__init__.py

@@ -8,8 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
-
+from __future__ import absolute_import, unicode_literals
 
 __api_version__ = "0.31"
 __version__ = "5.13.2"

+ 11 - 11
pagure/api/__init__.py

@@ -14,15 +14,15 @@ API namespace version 0.
 # pylint: disable=too-few-public-methods
 # pylint: disable=too-many-locals
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import codecs
+import enum
 import functools
 import logging
 import os
 
 import docutils
-import enum
 import flask
 import markupsafe
 from six.moves.urllib_parse import urljoin
@@ -33,15 +33,14 @@ API = flask.Blueprint("api_ns", __name__, url_prefix="/api/0")
 import pagure.lib.query  # noqa: E402
 import pagure.lib.tasks  # noqa: E402
 from pagure.config import config as pagure_config  # noqa: E402
-from pagure.doc_utils import (  # noqa: E402
+from pagure.doc_utils import (  # noqa: E402, I202
     load_doc_title_and_name,
-    modify_rst,
     modify_html,
-)  # noqa: E402
+    modify_rst,
+)
 from pagure.exceptions import APIError  # noqa: E402
 from pagure.utils import authenticated, check_api_acls  # noqa: E402
 
-
 _log = logging.getLogger(__name__)
 
 
@@ -335,11 +334,12 @@ def get_per_page():
 if pagure_config.get("ENABLE_TICKETS", True):
     from pagure.api import issue  # noqa: E402
     from pagure.api import boards  # noqa: E402, F401
-from pagure.api import fork  # noqa: E402
-from pagure.api import project  # noqa: E402
-from pagure.api import user  # noqa: E402
-from pagure.api import group  # noqa: E402
-from pagure.api import plugins  # noqa: E402
+
+from pagure.api import fork  # noqa: E402, I202
+from pagure.api import group  # noqa: E402, I202
+from pagure.api import plugins  # noqa: E402, I202
+from pagure.api import project  # noqa: E402, I202
+from pagure.api import user  # noqa: E402, I202
 
 if pagure_config.get("PAGURE_CI_SERVICES", False):
     from pagure.api.ci import jenkins  # noqa: E402, F401

+ 6 - 11
pagure/api/boards.py

@@ -8,32 +8,27 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 
 import flask
-from sqlalchemy.exc import SQLAlchemyError
 import werkzeug.datastructures
+from sqlalchemy.exc import SQLAlchemyError
 
 import pagure
 import pagure.exceptions
 import pagure.lib.query
 import pagure.lib.tasks
-from pagure.forms import TAGS_REGEX, TAGS_REGEX_RE
 from pagure.api import (
     API,
-    api_method,
-    api_login_required,
     APIERROR,
+    api_login_required,
+    api_method,
     get_request_data,
 )
-from pagure.api.utils import (
-    _get_repo,
-    _check_token,
-    _check_issue_tracker,
-)
-
+from pagure.api.utils import _check_issue_tracker, _check_token, _get_repo
+from pagure.forms import TAGS_REGEX, TAGS_REGEX_RE
 
 _log = logging.getLogger(__name__)
 

+ 3 - 5
pagure/api/ci/jenkins.py

@@ -8,23 +8,21 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 
 import flask
-
 from cryptography.hazmat.primitives import constant_time
 from kitchen.text.converters import to_bytes
 
 import pagure
 import pagure.exceptions
-import pagure.lib.query
-import pagure.lib.plugins
 import pagure.lib.lib_ci as lib_ci
+import pagure.lib.plugins
+import pagure.lib.query
 from pagure.api import API, APIERROR, api_method
 
-
 _log = logging.getLogger(__name__)
 
 

+ 10 - 11
pagure/api/fork.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 
@@ -22,25 +22,24 @@ import pagure.lib.query
 import pagure.lib.tasks
 from pagure.api import (
     API,
-    api_method,
-    api_login_required,
     APIERROR,
+    api_login_required,
+    api_method,
     get_authorized_api_project,
-    get_request_data,
     get_page,
     get_per_page,
+    get_request_data,
 )
-from pagure.config import config as pagure_config
-from pagure.utils import is_repo_committer, is_true
 from pagure.api.utils import (
-    _get_repo,
-    _check_token,
-    _get_request,
+    _check_private_pull_request_access,
     _check_pull_request,
     _check_pull_request_access,
-    _check_private_pull_request_access,
+    _check_token,
+    _get_repo,
+    _get_request,
 )
-
+from pagure.config import config as pagure_config
+from pagure.utils import is_repo_committer, is_true
 
 _log = logging.getLogger(__name__)
 

+ 2 - 2
pagure/api/group.py

@@ -9,7 +9,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import flask
 
@@ -19,8 +19,8 @@ import pagure.lib.query
 from pagure.api import (
     API,
     APIERROR,
-    api_method,
     api_login_optional,
+    api_method,
     get_page,
     get_per_page,
 )

+ 15 - 15
pagure/api/issue.py

@@ -8,41 +8,41 @@
 
 """
 
-from __future__ import print_function, unicode_literals, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
-import flask
 import datetime
 import logging
 
 import arrow
+import flask
 from sqlalchemy.exc import SQLAlchemyError
 
 import pagure.exceptions
 import pagure.lib.query
 from pagure.api import (
     API,
-    api_method,
-    api_login_required,
-    api_login_optional,
     APIERROR,
-    get_request_data,
+    api_login_optional,
+    api_login_required,
+    api_method,
     get_page,
     get_per_page,
+    get_request_data,
+)
+from pagure.api.utils import (
+    _check_issue_tracker,
+    _check_private_issue_access,
+    _check_ticket_access,
+    _check_token,
+    _get_issue,
+    _get_repo,
 )
 from pagure.config import config as pagure_config
 from pagure.utils import (
     api_authenticated,
     is_repo_committer,
-    urlpattern,
     is_true,
-)
-from pagure.api.utils import (
-    _get_repo,
-    _check_token,
-    _get_issue,
-    _check_issue_tracker,
-    _check_ticket_access,
-    _check_private_issue_access,
+    urlpattern,
 )
 
 _log = logging.getLogger(__name__)

+ 7 - 8
pagure/api/plugins.py

@@ -8,25 +8,24 @@
 
 """
 
-from __future__ import print_function, unicode_literals, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
-import flask
 import logging
 
+import flask
 from sqlalchemy.exc import SQLAlchemyError
 
 import pagure.exceptions
-import pagure.lib.query
-
 import pagure.lib.plugins as plugins_lib
+import pagure.lib.query
 from pagure.api import (
     API,
-    api_method,
-    api_login_required,
-    api_login_optional,
     APIERROR,
+    api_login_optional,
+    api_login_required,
+    api_method,
 )
-from pagure.api.utils import _get_repo, _check_token, _check_plugin
+from pagure.api.utils import _check_plugin, _check_token, _get_repo
 
 _log = logging.getLogger(__name__)
 

+ 8 - 10
pagure/api/project.py

@@ -8,15 +8,14 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-import flask
 import logging
 
+import flask
 import pygit2
-
-from sqlalchemy.exc import SQLAlchemyError
 from six import string_types
+from sqlalchemy.exc import SQLAlchemyError
 
 try:
     from pygit2 import AlreadyExistsError
@@ -25,26 +24,25 @@ except ImportError:
     AlreadyExistsError = ValueError
 
 import pagure
-import pagure.forms
 import pagure.exceptions
+import pagure.forms
 import pagure.lib.git
 import pagure.lib.query
 import pagure.utils
 from pagure.api import (
     API,
-    api_method,
     APIERROR,
+    api_login_optional,
     api_login_required,
+    api_method,
     get_authorized_api_project,
-    api_login_optional,
-    get_request_data,
     get_page,
     get_per_page,
+    get_request_data,
 )
-from pagure.api.utils import _get_repo, _check_token, _get_project_tag
+from pagure.api.utils import _check_token, _get_project_tag, _get_repo
 from pagure.config import config as pagure_config
 
-
 _log = logging.getLogger(__name__)
 
 

+ 2 - 2
pagure/api/user.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import collections
 import datetime
@@ -20,7 +20,7 @@ import six
 import pagure
 import pagure.exceptions
 import pagure.lib.query
-from pagure.api import API, api_method, APIERROR, get_page, get_per_page
+from pagure.api import API, APIERROR, api_method, get_page, get_per_page
 from pagure.utils import is_true, validate_date, validate_date_range
 
 

+ 4 - 8
pagure/api/utils.py

@@ -8,22 +8,18 @@
 
 """
 
-from __future__ import print_function, unicode_literals, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
-import flask
 import logging
 
+import flask
 
 import pagure.exceptions
-
-from pagure.lib import plugins
-
-from pagure.config import config as pagure_config
 from pagure.api import APIERROR, get_authorized_api_project
-
+from pagure.config import config as pagure_config
+from pagure.lib import plugins
 from pagure.utils import api_authenticated, is_repo_committer, is_repo_user
 
-
 _log = logging.getLogger(__name__)
 
 

+ 4 - 5
pagure/cli/admin.py

@@ -8,18 +8,18 @@
 
 """
 
-from __future__ import print_function, unicode_literals, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
 import argparse
 import datetime
 import logging
 import os
-import requests
-from string import Template
 import sys
-import pygit2
+from string import Template
 
 import arrow
+import pygit2
+import requests
 from six.moves import input
 
 if "PAGURE_CONFIG" not in os.environ and os.path.exists(
@@ -38,7 +38,6 @@ import pagure.lib.tasks_utils  # noqa: E402
 from pagure.flask_app import generate_user_key_files  # noqa: E402
 from pagure.utils import get_repo_path  # noqa: E402
 
-
 _config = pagure.config.reload_config()
 session = pagure.lib.model_base.create_session(_config["DB_URL"])
 _log = logging.getLogger(__name__)

+ 2 - 1
pagure/config.py

@@ -8,9 +8,10 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import os  # noqa: E402
+
 import flask  # noqa: E402
 
 

+ 4 - 2
pagure/decorators.py

@@ -9,11 +9,13 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
+
+from functools import wraps
 
 import flask
+
 from pagure.flask_app import admin_session_timedout
-from functools import wraps
 
 
 def has_issue_tracker(function):

+ 2 - 3
pagure/default_config.py

@@ -8,13 +8,12 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import os
 from datetime import timedelta
 
-from pagure.mail_logging import ContextInjector, MSG_FORMAT
-
+from pagure.mail_logging import MSG_FORMAT, ContextInjector  # noqa: I101
 
 # Set the time after which the admin session expires
 ADMIN_SESSION_LIFETIME = timedelta(minutes=20)

+ 5 - 4
pagure/doc_utils.py

@@ -10,7 +10,9 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
+
+import textwrap
 
 import docutils
 import docutils.core
@@ -18,11 +20,10 @@ import docutils.examples
 import jinja2
 import kitchen.text.converters as ktc
 import markupsafe
-import textwrap
 
-from pagure.config import config as pagure_config
-import pagure.lib.query
 import pagure.lib.encoding_utils
+import pagure.lib.query
+from pagure.config import config as pagure_config
 
 
 def modify_rst(rst, view_file_url=None):

+ 2 - 3
pagure/docs_server.py

@@ -8,24 +8,23 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 import os
 
 import flask
 import pygit2
-
 from binaryornot.helpers import is_binary_string
 from whitenoise import WhiteNoise
 
 import pagure.config
 import pagure.doc_utils
 import pagure.exceptions
+import pagure.forms
 import pagure.lib.mimetype
 import pagure.lib.model_base
 import pagure.lib.query
-import pagure.forms
 
 # Create the application.
 APP = flask.Flask(__name__)

+ 1 - 1
pagure/exceptions.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 
 class PagureException(Exception):

+ 5 - 6
pagure/flask_app.py

@@ -8,20 +8,19 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 import gc
 import logging
+import os
 import string
 import time
-import os
 import warnings
-from six.moves.urllib.parse import urljoin
 
 import flask
 import pygit2
-
+from six.moves.urllib.parse import urljoin
 from whitenoise import WhiteNoise
 
 import pagure.doc_utils
@@ -100,7 +99,7 @@ def create_app(config=None):
         FAS.init_app(app)
     elif auth == "oidc":
         # Only import and set flask_fas_openid if it is needed
-        from pagure.ui.oidc_login import oidc, fas_user_from_oidc
+        from pagure.ui.oidc_login import fas_user_from_oidc, oidc
 
         oidc.init_app(app)
         app.before_request(fas_user_from_oidc)
@@ -453,7 +452,7 @@ def auth_login():  # pragma: no cover
     auth = pagure_config.get("PAGURE_AUTH", None)
 
     if not authenticated and auth == "oidc":
-        from pagure.ui.oidc_login import oidc, fas_user_from_oidc, set_user
+        from pagure.ui.oidc_login import fas_user_from_oidc, oidc, set_user
 
         # If oidc is used and user hits this endpoint, it will redirect
         # to IdP with destination=<pagure>/login?next=<location>

+ 2 - 2
pagure/forms.py

@@ -12,7 +12,7 @@
 # pylint: disable=no-init
 # pylint: disable=super-on-old-class
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 import re
@@ -31,7 +31,7 @@ import wtforms
 import pagure.lib.query
 import pagure.validators
 from pagure.config import config as pagure_config
-from pagure.utils import urlpattern, is_admin
+from pagure.utils import is_admin, urlpattern
 
 STRICT_REGEX = "^[a-zA-Z0-9-_]+$"
 # This regex is used when creating tags, there we do not want to allow ','

+ 4 - 4
pagure/hooks/__init__.py

@@ -8,20 +8,20 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
+import os
 import subprocess
 import sys
 import traceback
-import os
 
 import six
 import wtforms
 
+import pagure.lib.git
+import pagure.lib.query
 from pagure.config import config as pagure_config
 from pagure.exceptions import FileNotFoundException
-import pagure.lib.query
-import pagure.lib.git
 from pagure.lib.git_auth import get_git_auth_helper
 from pagure.lib.plugins import get_enabled_plugins
 

+ 1 - 2
pagure/hooks/default.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, print_function, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
 import logging
 
@@ -23,7 +23,6 @@ import pagure.lib.tasks_services
 import pagure.utils
 from pagure.hooks import BaseHook, BaseRunner
 
-
 _config = pagure.config.reload_config()
 _log = logging.getLogger(__name__)
 

+ 3 - 3
pagure/hooks/fedmsg_hook.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import sqlalchemy as sa
 import wtforms
@@ -17,8 +17,8 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 from pagure.hooks import BaseHook, BaseRunner
 from pagure.lib.model import BASE, Project

+ 4 - 4
pagure/hooks/irc.py

@@ -8,18 +8,18 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-import sqlalchemy as sa
 import pygit2
+import sqlalchemy as sa
 import wtforms
 
 try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 from pagure.hooks import BaseHook, RequiredIf
 from pagure.lib.model import BASE, Project

+ 6 - 5
pagure/hooks/mail.py

@@ -8,20 +8,21 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-import sqlalchemy as sa
 import os
-import pygit2
 import subprocess
+
+import pygit2
+import sqlalchemy as sa
 import wtforms
 
 try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 from pagure.config import config as pagure_config
 from pagure.hooks import BaseHook, BaseRunner, RequiredIf

+ 3 - 4
pagure/hooks/mirror_hook.py

@@ -7,7 +7,7 @@
    Pierre-Yves Chibon <pingou@pingoured.fr>
 
 """
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import sqlalchemy as sa
 import wtforms
@@ -16,8 +16,8 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 import pagure.config
 import pagure.lib.tasks_mirror
@@ -25,7 +25,6 @@ from pagure.hooks import BaseHook, BaseRunner, RequiredIf
 from pagure.lib.model import BASE, Project
 from pagure.utils import get_repo_path, ssh_urlpattern
 
-
 _config = pagure.config.reload_config()
 
 

+ 3 - 3
pagure/hooks/pagure_ci.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import flask
 import sqlalchemy as sa
@@ -18,8 +18,8 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 import pagure.lib.login
 from pagure.hooks import BaseHook, BaseRunner, RequiredIf

+ 3 - 3
pagure/hooks/pagure_force_commit.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import sqlalchemy as sa
 import wtforms
@@ -17,8 +17,8 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 import pagure.lib.git
 from pagure.hooks import BaseHook, BaseRunner, RequiredIf

+ 4 - 5
pagure/hooks/pagure_hook.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 
@@ -20,17 +20,16 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
+
 from sqlalchemy.exc import SQLAlchemyError
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+from sqlalchemy.orm import backref, relation
 
 import pagure.config
-import pagure.lib.query
 import pagure.lib.git
+import pagure.lib.query
 from pagure.hooks import BaseHook, BaseRunner
 from pagure.lib.model import BASE, Project
 
-
 _log = logging.getLogger(__name__)
 pagure_config = pagure.config.reload_config()
 

+ 3 - 3
pagure/hooks/pagure_no_new_branches.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import sqlalchemy as sa
 import wtforms
@@ -17,8 +17,8 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 from pagure.hooks import BaseHook, BaseRunner
 from pagure.lib.model import BASE, Project

+ 3 - 3
pagure/hooks/pagure_request_hook.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import sqlalchemy as sa
 import wtforms
@@ -17,8 +17,8 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 import pagure.lib.git
 import pagure.lib.tasks_services

+ 3 - 3
pagure/hooks/pagure_ticket_hook.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import os
 
@@ -19,8 +19,8 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 import pagure.lib.git
 import pagure.lib.tasks_services

+ 3 - 4
pagure/hooks/pagure_unsigned_commits.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import sqlalchemy as sa
 import wtforms
@@ -17,15 +17,14 @@ try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 import pagure.config
 import pagure.lib.git
 from pagure.hooks import BaseHook, BaseRunner
 from pagure.lib.model import BASE, Project
 
-
 _config = pagure.config.reload_config()
 
 

+ 4 - 4
pagure/hooks/rtd.py

@@ -9,18 +9,18 @@
 """
 
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-import sqlalchemy as sa
 import requests
+import sqlalchemy as sa
 import wtforms
 
 try:
     from flask_wtf import FlaskForm
 except ImportError:
     from flask_wtf import Form as FlaskForm
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import backref
+
+from sqlalchemy.orm import backref, relation
 
 import pagure
 from pagure.hooks import BaseHook, BaseRunner

+ 3 - 5
pagure/internal/__init__.py

@@ -10,17 +10,16 @@ Internal endpoints.
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import collections
 import logging
 import os
+from functools import wraps
 
 import flask
 import pygit2
 import werkzeug.utils
-
-from functools import wraps
 from sqlalchemy.exc import SQLAlchemyError
 
 PV = flask.Blueprint("internal_ns", __name__, url_prefix="/pv")
@@ -31,11 +30,10 @@ import pagure.forms  # noqa: E402
 import pagure.lib.git  # noqa: E402
 import pagure.lib.query  # noqa: E402
 import pagure.lib.tasks  # noqa: E402
-import pagure.utils  # noqa: E402
 import pagure.ui.fork  # noqa: E402
+import pagure.utils  # noqa: E402
 from pagure.config import config as pagure_config  # noqa: E402
 
-
 _log = logging.getLogger(__name__)
 _auth_log = logging.getLogger("pagure_auth")
 

+ 3 - 3
pagure/lib/encoding_utils.py

@@ -11,9 +11,10 @@ the repetitive task of identifying the character encoding and decoding the
 content to unicode is implemented here.
 """
 
-from __future__ import unicode_literals, division, absolute_import
-from collections import namedtuple
+from __future__ import absolute_import, division, unicode_literals
+
 import logging
+from collections import namedtuple
 
 try:
     import cchardet
@@ -24,7 +25,6 @@ except ImportError:
 
 from pagure.exceptions import PagureEncodingException
 
-
 _log = logging.getLogger(__name__)
 
 Guess = namedtuple("Guess", ["encoding", "confidence"])

+ 12 - 15
pagure/lib/git.py

@@ -7,13 +7,7 @@
    Pierre-Yves Chibon <pingou@pingoured.fr>
 
 """
-from __future__ import print_function, unicode_literals, absolute_import
-
-# pylint: disable=too-many-branches
-# pylint: disable=too-many-arguments
-# pylint: disable=too-many-locals
-# pylint: disable=too-many-statements
-# pylint: disable=too-many-lines
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 import json
@@ -21,31 +15,34 @@ import logging
 import os
 import shutil
 import subprocess
-import requests
-import tempfile
 import tarfile
+import tempfile
 import zipfile
 
 import arrow
 import pygit2
+import requests
 import six
 
-from sqlalchemy.exc import SQLAlchemyError
-
 # from sqlalchemy.orm.session import Session
 from pygit2.remote import RemoteCollection
+from sqlalchemy.exc import SQLAlchemyError
 
-import pagure.utils
 import pagure.exceptions
-import pagure.lib.query
+import pagure.hooks
 import pagure.lib.notify
+import pagure.lib.query
 import pagure.lib.tasks
+import pagure.utils
 from pagure.config import config as pagure_config
 from pagure.lib import model
 from pagure.lib.repo import PagureRepo
-import pagure.hooks
 
-# from pagure.hooks import run_project_hooks
+# pylint: disable=too-many-branches
+# pylint: disable=too-many-arguments
+# pylint: disable=too-many-locals
+# pylint: disable=too-many-statements
+# pylint: disable=too-many-lines
 
 
 _log = logging.getLogger(__name__)

+ 2 - 3
pagure/lib/git_auth.py

@@ -7,17 +7,17 @@
    Pierre-Yves Chibon <pingou@pingoured.fr>
 
 """
-from __future__ import print_function, unicode_literals, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
 import abc
 import json
 import logging
 import os
-import pkg_resources
 import subprocess
 import tempfile
 from io import open
 
+import pkg_resources
 import werkzeug.utils
 from six import with_metaclass
 from six.moves import dbm_gnu
@@ -29,7 +29,6 @@ from pagure.config import config as pagure_config
 from pagure.lib import model
 from pagure.utils import is_repo_collaborator, lookup_deploykey
 
-
 # logging.config.dictConfig(pagure_config.get('LOGGING') or {'version': 1})
 _log = logging.getLogger(__name__)
 

+ 2 - 2
pagure/lib/lib_ci.py

@@ -10,14 +10,14 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 # pylint: disable=too-many-locals
 import logging
 import time
+
 import pagure.exceptions
 import pagure.lib.query
-
 from pagure.config import config as pagure_config
 
 _log = logging.getLogger(__name__)

+ 3 - 3
pagure/lib/link.py

@@ -10,15 +10,15 @@
 
 # pylint: disable=too-many-arguments
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import re
-import pagure.lib.query
+
 import pagure.exceptions
+import pagure.lib.query
 import pagure.utils
 from pagure.config import config as pagure_config
 
-
 FIXES = [
     re.compile(r"(?:.*\s+)?{0}?[sd]?:?\s*?#(\d+)".format(kw), re.I)
     for kw in ["fix", "fixe", "merge", "close", "resolve"]

+ 4 - 3
pagure/lib/login.py

@@ -9,7 +9,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 try:
     # Provided in Python 3.6+
@@ -21,14 +21,15 @@ except ImportError:
     random = random.SystemRandom()
     random_choice = random.choice
 
-import string
 import hashlib
+import string
+
 import bcrypt
 import six
+from cryptography.hazmat.primitives import constant_time
 
 import pagure.config
 from pagure.lib import model
-from cryptography.hazmat.primitives import constant_time
 
 
 def id_generator(size=15, chars=string.ascii_uppercase + string.digits):

+ 2 - 2
pagure/lib/mimetype.py

@@ -1,15 +1,15 @@
 # -*- coding: utf-8 -*-
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 import mimetypes
+
 import kitchen.text.converters as ktc
 import six
 
 import pagure.lib.encoding_utils
 
-
 _log = logging.getLogger(__name__)
 
 

+ 14 - 14
pagure/lib/model.py

@@ -8,29 +8,30 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-import arrow
-import datetime
 import collections
-import logging
+import datetime
 import json
+import logging
 import operator
-import re
-import pygit2
 import os
+import re
 from operator import attrgetter
 
+import arrow
+import pygit2
 import six
 import sqlalchemy as sa
-
 from sqlalchemy import create_engine
 from sqlalchemy.exc import SQLAlchemyError
-from sqlalchemy.orm import backref
-from sqlalchemy.orm import sessionmaker
-from sqlalchemy.orm import scoped_session
-from sqlalchemy.orm import relation
-from sqlalchemy.orm import validates
+from sqlalchemy.orm import (
+    backref,
+    relation,
+    scoped_session,
+    sessionmaker,
+    validates,
+)
 
 import pagure.exceptions
 from pagure.config import config as pagure_config
@@ -38,7 +39,6 @@ from pagure.lib.model_base import BASE
 from pagure.lib.plugins import get_plugin_tables
 from pagure.utils import is_true
 
-
 _log = logging.getLogger(__name__)
 
 # hit w/ all the id field we use
@@ -86,8 +86,8 @@ def create_tables(db_url, alembic_ini=None, acls=None, debug=False):
 
         # Ignore the warning missing alembic
         # pylint: disable=import-error
-        from alembic.config import Config
         from alembic import command
+        from alembic.config import Config
 
         alembic_cfg = Config(alembic_ini)
         command.stamp(alembic_cfg, "head")

+ 2 - 4
pagure/lib/model_base.py

@@ -8,13 +8,11 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import sqlalchemy
 from sqlalchemy.ext.declarative import declarative_base
-from sqlalchemy.orm import sessionmaker
-from sqlalchemy.orm import scoped_session
-
+from sqlalchemy.orm import scoped_session, sessionmaker
 
 CONVENTION = {
     "ix": "ix_%(table_name)s_%(column_0_label)s",

+ 9 - 10
pagure/lib/notify.py

@@ -8,12 +8,7 @@
 
 pagure notifications.
 """
-from __future__ import print_function, unicode_literals, absolute_import
-
-
-# pylint: disable=too-many-branches
-# pylint: disable=too-many-arguments
-
+from __future__ import absolute_import, print_function, unicode_literals
 
 import datetime
 import hashlib
@@ -22,20 +17,24 @@ import logging
 import os
 import re
 import smtplib
-import time
-import six
 import ssl
+import time
 from email.header import Header
 from email.mime.text import MIMEText
-from six.moves.urllib_parse import urljoin
 
 import blinker
 import flask
+import six
+from markdown.extensions.fenced_code import FencedBlockPreprocessor
+from six.moves.urllib_parse import urljoin
+
 import pagure.lib.query
 import pagure.lib.tasks_services
 from pagure.config import config as pagure_config
 from pagure.pfmarkdown import MENTION_RE
-from markdown.extensions.fenced_code import FencedBlockPreprocessor
+
+# pylint: disable=too-many-branches
+# pylint: disable=too-many-arguments
 
 
 _log = logging.getLogger(__name__)

+ 1 - 1
pagure/lib/plugins.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 from straight.plugin import load
 

+ 4 - 7
pagure/lib/query.py

@@ -9,7 +9,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 # pylint: disable=too-many-branches
 # pylint: disable=too-many-arguments
@@ -34,7 +34,6 @@ import shutil
 import subprocess
 import tempfile
 import uuid
-
 from collections import Counter
 from math import ceil
 
@@ -45,11 +44,10 @@ import six
 import sqlalchemy
 import sqlalchemy.schema
 import werkzeug.utils
-
-from six.moves.urllib_parse import urlparse, urlencode, parse_qsl
-from sqlalchemy import asc, desc, func, cast, Text
-from sqlalchemy.orm import aliased
 from flask import url_for
+from six.moves.urllib_parse import parse_qsl, urlencode, urlparse
+from sqlalchemy import Text, asc, cast, desc, func
+from sqlalchemy.orm import aliased
 
 import pagure.exceptions
 import pagure.lib.git
@@ -68,7 +66,6 @@ from pagure.lib import model
 # For backward compatibility since this function used to be in this file
 from pagure.lib.model_base import create_session  # noqa
 
-
 REDIS = None
 PAGURE_CI = None
 _log = logging.getLogger(__name__)

+ 1 - 2
pagure/lib/repo.py

@@ -7,7 +7,7 @@
    Pierre-Yves Chibon <pingou@pingoured.fr>
 
 """
-from __future__ import print_function, unicode_literals, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
 import logging
 import subprocess
@@ -17,7 +17,6 @@ import pygit2
 import pagure
 import pagure.exceptions
 
-
 _log = logging.getLogger(__name__)
 
 

+ 3 - 4
pagure/lib/tasks.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import collections
 import datetime
@@ -22,7 +22,6 @@ import time
 import arrow
 import pygit2
 import six
-
 from celery import Celery
 from celery.result import AsyncResult
 from celery.signals import after_setup_task_logger
@@ -32,12 +31,12 @@ from sqlalchemy.exc import SQLAlchemyError
 import pagure.lib.git
 import pagure.lib.git_auth
 import pagure.lib.link
-import pagure.lib.query
 import pagure.lib.model
+import pagure.lib.query
 import pagure.lib.repo
 import pagure.utils
-from pagure.lib.tasks_utils import pagure_task
 from pagure.config import config as pagure_config
+from pagure.lib.tasks_utils import pagure_task
 from pagure.utils import get_parent_repo_path
 
 # logging.config.dictConfig(pagure_config.get('LOGGING') or {'version': 1})

+ 2 - 3
pagure/lib/tasks_mirror.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import base64
 import datetime
@@ -19,12 +19,11 @@ import struct
 
 import six
 import werkzeug.utils
-
 from celery import Celery
 from cryptography import utils
 from cryptography.hazmat.backends import default_backend
-from cryptography.hazmat.primitives.asymmetric import rsa
 from cryptography.hazmat.primitives import serialization
+from cryptography.hazmat.primitives.asymmetric import rsa
 
 import pagure.lib.query
 from pagure.config import config as pagure_config

+ 3 - 4
pagure/lib/tasks_services.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 import hashlib
@@ -21,7 +21,6 @@ import uuid
 
 import requests
 import six
-
 from celery import Celery
 from celery.signals import after_setup_task_logger
 from celery.utils.log import get_task_logger
@@ -30,10 +29,10 @@ from sqlalchemy.exc import SQLAlchemyError
 
 import pagure.lib.query
 from pagure.config import config as pagure_config
+from pagure.lib.lib_ci import trigger_jenkins_build
 from pagure.lib.tasks_utils import pagure_task
 from pagure.mail_logging import format_callstack
-from pagure.lib.lib_ci import trigger_jenkins_build
-from pagure.utils import split_project_fullname, set_up_logging
+from pagure.utils import set_up_logging, split_project_fullname
 
 # logging.config.dictConfig(pagure_config.get('LOGGING') or {'version': 1})
 _log = get_task_logger(__name__)

+ 1 - 1
pagure/lib/tasks_utils.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import gc
 from functools import wraps

+ 1 - 1
pagure/login_forms.py

@@ -20,7 +20,7 @@
 # pylint: disable=no-init
 
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import wtforms
 

+ 2 - 3
pagure/mail_logging.py

@@ -23,12 +23,11 @@
 Mail handler for logging.
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
+import inspect
 import logging
 import logging.handlers
-
-import inspect
 import socket
 import traceback
 

+ 3 - 4
pagure/perfrepo.py

@@ -9,16 +9,15 @@
 
 """
 
-from __future__ import print_function, unicode_literals, absolute_import
+from __future__ import absolute_import, print_function, unicode_literals
 
-
-import pprint
 import os
+import pprint
 import traceback
 import types
 
-import six
 import pygit2
+import six
 
 try:
     import _pygit2

+ 3 - 5
pagure/pfmarkdown.py

@@ -19,24 +19,22 @@ Author: Ralph Bean <rbean@redhat.com>
         Pierre-Yves Chibon <pingou@pingoured.fr>
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
+import re
 
 import flask
-
 import markdown.inlinepatterns
-import markdown.preprocessors
 import markdown.postprocessors
+import markdown.preprocessors
 import markdown.util
 import pygit2
-import re
 import six
 
 import pagure.lib.query
 from pagure.config import config as pagure_config
 
-
 try:
     from markdown.inlinepatterns import ImagePattern as ImagePattern
 

+ 1 - 1
pagure/proxy.py

@@ -26,7 +26,7 @@ redirects are using ``https``.
 Source: http://flask.pocoo.org/snippets/35/ by Peter Hansen
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 
 class ReverseProxied(object):  # pragma: no cover

+ 5 - 4
pagure/ui/__init__.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import flask
 
@@ -17,15 +17,16 @@ UI_NS = flask.Blueprint("ui_ns", __name__)
 # Import the different controllers in the UI namespace/blueprint
 import pagure.config  # noqa: E402
 import pagure.ui.app  # noqa: E402
-from pagure.ui.clone import add_clone_proxy_cmds  # noqa: E402
 import pagure.ui.fork  # noqa: E402
 import pagure.ui.groups  # noqa: E402
+from pagure.ui.clone import add_clone_proxy_cmds  # noqa: E402
 
 if pagure.config.config.get("ENABLE_TICKETS", True):
     import pagure.ui.issues  # noqa: E402
     import pagure.ui.boards  # noqa: E402
-import pagure.ui.plugins  # noqa: E402
-import pagure.ui.repo  # noqa: E402
+
+import pagure.ui.plugins  # noqa: E402, I202
+import pagure.ui.repo  # noqa: E402, I202
 
 if pagure.config.config["PAGURE_AUTH"] == "local":
     import pagure.ui.login  # noqa: E402

+ 4 - 5
pagure/ui/app.py

@@ -9,7 +9,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 import logging
@@ -19,23 +19,22 @@ import flask
 from sqlalchemy.exc import SQLAlchemyError
 
 import pagure.exceptions
+import pagure.forms
 import pagure.lib.git
 import pagure.lib.query
 import pagure.lib.tasks
-import pagure.forms
 import pagure.ui.filters
 from pagure.config import config as pagure_config
 from pagure.flask_app import _get_user, admin_session_timedout
 from pagure.ui import UI_NS
 from pagure.utils import (
     authenticated,
-    is_safe_url,
-    login_required,
     get_task_redirect_url,
+    is_safe_url,
     is_true,
+    login_required,
 )
 
-
 _log = logging.getLogger(__name__)
 
 

+ 5 - 9
pagure/ui/boards.py

@@ -14,23 +14,19 @@
 # pylint: disable=too-many-statements
 
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 
 import flask
 
-from pagure.ui import UI_NS
-from pagure.utils import (
-    authenticated,
-    login_required,
-)
 from pagure.decorators import (
-    is_repo_admin,
-    is_admin_sess_timedout,
     has_issue_tracker,
+    is_admin_sess_timedout,
+    is_repo_admin,
 )
-
+from pagure.ui import UI_NS
+from pagure.utils import authenticated, login_required
 
 _log = logging.getLogger(__name__)
 

+ 3 - 3
pagure/ui/clone.py

@@ -8,25 +8,25 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import base64
 import logging
+import os
 import subprocess
 import tempfile
-import os
 
 import flask
 import requests
 import werkzeug.wsgi
 
 import pagure.exceptions
+import pagure.forms
 import pagure.lib.git
 import pagure.lib.mimetype
 import pagure.lib.plugins
 import pagure.lib.query
 import pagure.lib.tasks
-import pagure.forms
 import pagure.ui.plugins
 from pagure.config import config as pagure_config
 from pagure.ui import UI_NS

+ 3 - 4
pagure/ui/fas_login.py

@@ -8,21 +8,20 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 from base64 import b64decode
 
 import flask
+import flask_fas_openid
 from flask import Markup
-
 from sqlalchemy.exc import SQLAlchemyError
 
 import pagure.lib.query
 import pagure.utils
-from pagure.flask_app import logout
 from pagure.config import config as pagure_config
-import flask_fas_openid
+from pagure.flask_app import logout
 
 FAS = flask_fas_openid.FAS()
 

+ 5 - 7
pagure/ui/filters.py

@@ -13,30 +13,28 @@
 # pylint: disable=too-many-locals
 
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-import textwrap
 import logging
 import os
+import textwrap
 from os.path import splitext
 
 import arrow
 import bleach
 import flask
-import six
 import pygit2
-
-from six.moves.urllib.parse import urlparse, parse_qsl
+import six
 from jinja2 import escape
+from six.moves.urllib.parse import parse_qsl, urlparse
 
 import pagure.exceptions
-import pagure.lib.query
 import pagure.forms
+import pagure.lib.query
 from pagure.config import config as pagure_config
 from pagure.ui import UI_NS
 from pagure.utils import authenticated, is_repo_committer, is_true
 
-
 _log = logging.getLogger(__name__)
 # Jinja filters
 

+ 4 - 5
pagure/ui/fork.py

@@ -16,10 +16,10 @@
 # pylint: disable=too-many-lines
 
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
-import logging
 import json
+import logging
 import os
 from math import ceil
 
@@ -30,21 +30,20 @@ from sqlalchemy.exc import SQLAlchemyError
 import pagure
 import pagure.doc_utils
 import pagure.exceptions
+import pagure.forms
 import pagure.lib.git
 import pagure.lib.plugins
 import pagure.lib.query
 import pagure.lib.tasks
-import pagure.forms
 from pagure.config import config as pagure_config
 from pagure.ui import UI_NS
 from pagure.utils import (
-    login_required,
     __get_file_in_tree,
     get_parent_repo_path,
     is_true,
+    login_required,
 )
 
-
 _log = logging.getLogger(__name__)
 
 

+ 1 - 2
pagure/ui/groups.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 
@@ -22,7 +22,6 @@ from pagure.config import config as pagure_config
 from pagure.ui import UI_NS
 from pagure.utils import login_required
 
-
 _log = logging.getLogger(__name__)
 
 

+ 7 - 9
pagure/ui/issues.py

@@ -14,39 +14,37 @@
 # pylint: disable=too-many-statements
 
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 import logging
 import os
-from collections import defaultdict, OrderedDict
+from collections import OrderedDict, defaultdict
 from math import ceil
 
 import flask
 import pygit2
 import werkzeug.datastructures
-from sqlalchemy.exc import SQLAlchemyError
 from binaryornot.helpers import is_binary_string
 from six.moves.urllib.parse import urljoin
+from sqlalchemy.exc import SQLAlchemyError
 
 import pagure.doc_utils
 import pagure.exceptions
-import pagure.lib.query
-import pagure.lib.mimetype
-from pagure.decorators import has_issue_tracker, is_repo_admin
-
 import pagure.forms
+import pagure.lib.mimetype
+import pagure.lib.query
 from pagure.config import config as pagure_config
+from pagure.decorators import has_issue_tracker, is_repo_admin
 from pagure.ui import UI_NS
 from pagure.utils import (
     __get_file_in_tree,
     authenticated,
+    is_true,
     login_required,
     urlpattern,
-    is_true,
 )
 
-
 _log = logging.getLogger(__name__)
 
 

+ 5 - 6
pagure/ui/login.py

@@ -9,26 +9,25 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 import logging
 
 import flask
-from sqlalchemy.exc import SQLAlchemyError
 from six.moves.urllib.parse import urljoin
+from sqlalchemy.exc import SQLAlchemyError
 
-import pagure.login_forms as forms
 import pagure.config
 import pagure.lib.login
 import pagure.lib.model as model
 import pagure.lib.model_base
 import pagure.lib.notify
 import pagure.lib.query
-from pagure.utils import login_required
-from pagure.lib.login import generate_hashed_value, check_password
+import pagure.login_forms as forms
+from pagure.lib.login import check_password, generate_hashed_value
 from pagure.ui import UI_NS
-
+from pagure.utils import login_required
 
 _log = logging.getLogger(__name__)
 

+ 3 - 4
pagure/ui/oidc_login.py

@@ -8,14 +8,15 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 from base64 import b64decode
 
 import flask
-from flask import Markup
 import munch
+from flask import Markup
+from flask_oidc import OpenIDConnect
 from sqlalchemy.exc import SQLAlchemyError
 
 import pagure.lib.query
@@ -23,8 +24,6 @@ from pagure.config import config as pagure_config
 from pagure.flask_app import logout
 from pagure.utils import is_admin
 
-from flask_oidc import OpenIDConnect
-
 oidc = OpenIDConnect()
 
 

+ 2 - 4
pagure/ui/plugins.py

@@ -11,23 +11,21 @@
 
 # pylint: disable=too-many-branches
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import logging
 
 import flask
 from flask import Markup
-
 from sqlalchemy.exc import SQLAlchemyError
 
 import pagure.exceptions
 import pagure.forms
 import pagure.lib.plugins
+from pagure.decorators import is_repo_admin
 from pagure.exceptions import FileNotFoundException
 from pagure.ui import UI_NS
 from pagure.utils import login_required
-from pagure.decorators import is_repo_admin
-
 
 _log = logging.getLogger(__name__)
 

+ 14 - 16
pagure/ui/repo.py

@@ -17,7 +17,7 @@
 # pylint: disable=broad-except
 
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 import json
@@ -25,45 +25,43 @@ import logging
 import os
 import re
 from math import ceil
-from six.moves.urllib.parse import urljoin
 
 import flask
-import pygit2
 import kitchen.text.converters as ktc
+import pygit2
 import six
 import werkzeug.utils
-
-from six import BytesIO
+from binaryornot.helpers import is_binary_string
 from PIL import Image
+from six import BytesIO
+from six.moves.urllib.parse import urljoin
 from sqlalchemy.exc import SQLAlchemyError
 
-from binaryornot.helpers import is_binary_string
-
 import pagure.exceptions
+import pagure.forms
 import pagure.lib.git
 import pagure.lib.mimetype
 import pagure.lib.plugins
 import pagure.lib.query
 import pagure.lib.tasks
-import pagure.forms
 import pagure.ui.plugins
 from pagure.config import config as pagure_config
+from pagure.decorators import (
+    has_issue_or_pr_enabled,
+    has_issue_tracker,
+    has_pr_enabled,
+    is_admin_sess_timedout,
+    is_repo_admin,
+)
 from pagure.flask_app import _get_user
 from pagure.lib import encoding_utils
 from pagure.ui import UI_NS
 from pagure.utils import (
     __get_file_in_tree,
-    login_required,
     is_true,
+    login_required,
     stream_template,
 )
-from pagure.decorators import (
-    is_repo_admin,
-    is_admin_sess_timedout,
-    has_issue_tracker,
-    has_issue_or_pr_enabled,
-    has_pr_enabled,
-)
 
 _log = logging.getLogger(__name__)
 

+ 5 - 6
pagure/utils.py

@@ -8,7 +8,7 @@
 
 """
 
-from __future__ import unicode_literals, absolute_import
+from __future__ import absolute_import, unicode_literals
 
 import datetime
 import fnmatch
@@ -16,21 +16,20 @@ import logging
 import logging.config
 import os
 import re
-from six.moves.urllib.parse import urlparse, urljoin
 from functools import wraps
 
 import flask
 import pygit2
 import six
 import werkzeug.utils
+from six.moves.urllib.parse import urljoin, urlparse
 
+from pagure.config import config as pagure_config
 from pagure.exceptions import (
-    PagureException,
-    InvalidTimestampException,
     InvalidDateformatException,
+    InvalidTimestampException,
+    PagureException,
 )
-from pagure.config import config as pagure_config
-
 
 _log = logging.getLogger(__name__)
 LOGGER_SETUP = False