Skip to content

Commit

Permalink
isort. Refs #1193
Browse files Browse the repository at this point in the history
  • Loading branch information
atodorov committed Nov 24, 2019
1 parent 1ac2784 commit 1d9eb66
Show file tree
Hide file tree
Showing 109 changed files with 300 additions and 442 deletions.
2 changes: 1 addition & 1 deletion tcms/bugs/admin.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.urls import reverse
from django.contrib import admin
from django.http import HttpResponseRedirect
from django.urls import reverse

from tcms.bugs.models import Bug
from tcms.core.history import ReadOnlyHistoryAdmin
Expand Down
2 changes: 1 addition & 1 deletion tcms/bugs/api.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-

from modernrpc.core import rpc_method, REQUEST_KEY
from modernrpc.core import REQUEST_KEY, rpc_method

from tcms.bugs.models import Bug
from tcms.management.models import Tag
Expand Down
2 changes: 1 addition & 1 deletion tcms/bugs/forms.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

from tcms.bugs.models import Bug
from tcms.core.widgets import SimpleMDE
from tcms.management.models import Version, Build
from tcms.management.models import Build, Version


class NewBugForm(forms.ModelForm):
Expand Down
1 change: 1 addition & 0 deletions tcms/bugs/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from django.conf import settings
from django.db import migrations, models

import tcms.core.models.base


Expand Down
2 changes: 1 addition & 1 deletion tcms/bugs/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@

# Licensed under the GPL 2.0: https://www.gnu.org/licenses/old-licenses/gpl-2.0.html

from django.db import models
from django.conf import settings
from django.db import models
from django.urls import reverse

from tcms.core.models.base import UrlMixin
Expand Down
2 changes: 1 addition & 1 deletion tcms/bugs/tests/test_permissions.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
from django.utils.translation import ugettext_lazy as _

from tcms import tests
from tcms.tests import factories
from tcms.bugs.models import Bug
from tcms.tests import factories


class NewTestCase(tests.PermissionsTestCase):
Expand Down
14 changes: 6 additions & 8 deletions tcms/bugs/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,22 +4,20 @@


from django.contrib.auth.decorators import permission_required
from django.urls import reverse
from django.http import HttpResponseRedirect
from django.test import modify_settings
from django.urls import reverse
from django.utils.decorators import method_decorator
from django.views.generic import DetailView
from django.views.generic.edit import CreateView
from django.views.generic.edit import UpdateView
from django.views.generic.base import View
from django.views.generic.base import TemplateView
from django.utils.translation import ugettext_lazy as _
from django.views.generic import DetailView
from django.views.generic.base import TemplateView, View
from django.views.generic.edit import CreateView, UpdateView

from tcms.bugs.forms import BugCommentForm, NewBugForm
from tcms.bugs.models import Bug
from tcms.management.models import Component
from tcms.bugs.forms import NewBugForm, BugCommentForm
from tcms.core.helpers.comments import add_comment
from tcms.core.response import ModifySettingsTemplateResponse
from tcms.management.models import Component


class Get(DetailView): # pylint: disable=missing-permission-required
Expand Down
7 changes: 3 additions & 4 deletions tcms/core/admin.py
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
# -*- coding: utf-8 -*-

from django.urls import reverse
from django.conf import settings
from django.contrib import admin
from django.http import HttpResponseRedirect
from django.contrib.sites.models import Site
from django.contrib.sites.admin import SiteAdmin

from django.contrib.sites.models import Site
from django.http import HttpResponseRedirect
from django.urls import reverse
from django_comments.models import Comment


Expand Down
11 changes: 5 additions & 6 deletions tcms/core/ajax.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,16 @@
"""
from http import HTTPStatus

from django.contrib.auth import get_user_model
from django.contrib.auth.decorators import permission_required
from django.db.models import Count
from django.http import JsonResponse
from django.views.generic.base import View
from django.contrib.auth import get_user_model
from django.utils.decorators import method_decorator
from django.shortcuts import render
from django.utils.decorators import method_decorator
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.decorators import permission_required
from django.views.generic.base import View

from tcms.testcases.models import TestCase
from tcms.testcases.models import TestCaseTag
from tcms.testcases.models import TestCase, TestCaseTag
from tcms.testplans.models import TestPlan, TestPlanTag
from tcms.testruns.models import TestRunTag

Expand Down
3 changes: 1 addition & 2 deletions tcms/core/contrib/comments/forms.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
# -*- coding: utf-8 -*-

from django.conf import settings
from django import forms
from django.conf import settings
from django.utils.translation import ugettext_lazy as _

from django_comments.forms import CommentDetailsForm

COMMENT_MAX_LENGTH = getattr(settings, 'COMMENT_MAX_LENGTH', 10000)
Expand Down
3 changes: 1 addition & 2 deletions tcms/core/contrib/comments/utils.py
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# -*- coding: utf-8 -*-

from django.apps import apps

import django_comments
from django.apps import apps


# todo: this is duplicate with tcms.core.helpers.comments.utils
Expand Down
3 changes: 1 addition & 2 deletions tcms/core/contrib/comments/views.py
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
# -*- coding: utf-8 -*-

import django_comments as comments
from django.conf import settings
from django.contrib.auth.decorators import permission_required
from django.core.exceptions import ObjectDoesNotExist
from django.http import JsonResponse
from django.views.decorators.http import require_POST

import django_comments as comments

from .utils import add_comment


Expand Down
5 changes: 2 additions & 3 deletions tcms/core/forms/fields.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
# -*- coding: utf-8 -*-

from django import forms
from django.db.models import Q
from django.core.exceptions import ValidationError
from django.contrib.auth import get_user_model

from django.core.exceptions import ValidationError
from django.db.models import Q

User = get_user_model() # pylint: disable=invalid-name

Expand Down
1 change: 0 additions & 1 deletion tcms/core/helpers/comments.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
from django.conf import settings
from django.contrib.contenttypes.models import ContentType
from django.contrib.sites.models import Site

from django_comments.models import Comment


Expand Down
3 changes: 1 addition & 2 deletions tcms/core/history.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,8 @@
from django.db.models import signals
from django.template.defaultfilters import safe
from django.utils.translation import ugettext_lazy as _

from simple_history.models import HistoricalRecords
from simple_history.admin import SimpleHistoryAdmin
from simple_history.models import HistoricalRecords


def diff_objects(old_instance, new_instance, fields):
Expand Down
2 changes: 1 addition & 1 deletion tcms/core/middleware.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
# pylint: disable=no-self-use, too-few-public-methods

from django.urls import reverse
from django.conf import settings
from django.contrib import messages
from django.contrib.sites.models import Site
from django.urls import reverse
from django.utils.deprecation import MiddlewareMixin
from django.utils.translation import ugettext_lazy as _

Expand Down
3 changes: 2 additions & 1 deletion tcms/core/serializer.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
from django.core.serializers.json import Deserializer # noqa, pylint: disable=unused-import
# pylint: disable=unused-import
from django.core.serializers.json import Deserializer # noqa
from django.core.serializers.json import Serializer as JsonSerializer


Expand Down
5 changes: 2 additions & 3 deletions tcms/core/templatetags/extra_filters.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@

import bleach
import markdown
from bleach_whitelist import markdown_tags, markdown_attrs, print_tags

from bleach_whitelist import markdown_attrs, markdown_tags, print_tags
from django import template
from django.utils.safestring import mark_safe
from django.contrib.messages import constants as messages
from django.utils.safestring import mark_safe

register = template.Library()

Expand Down
2 changes: 1 addition & 1 deletion tcms/core/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@

from http import HTTPStatus

from django.urls import reverse
from django.conf import settings
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _

from tcms.tests import LoggedInTestCase
Expand Down
12 changes: 4 additions & 8 deletions tcms/core/tests/test_ajax.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,23 +3,19 @@
from http import HTTPStatus

from django import test
from django.urls import reverse
from django.conf import settings
from django.db.models import Count
from django.http.request import HttpRequest
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _

from tcms.core.ajax import _TagCounter, _TagObjects
from tcms.testcases.models import TestCase, TestCaseTag
from tcms.testplans.models import TestPlanTag
from tcms.testruns.models import TestRunTag
from tcms.testcases.models import TestCase, TestCaseTag
from tcms.tests import BasePlanCase

from tcms.tests.factories import TagFactory
from tcms.tests.factories import TestRunFactory
from tcms.tests.factories import TestCaseFactory
from tcms.tests.factories import TestPlanFactory

from tcms.tests.factories import (TagFactory, TestCaseFactory, TestPlanFactory,
TestRunFactory)
from tcms.utils.permissions import initiate_user_with_default_setups


Expand Down
2 changes: 1 addition & 1 deletion tcms/core/tests/test_helpers.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
from django.contrib.contenttypes.models import ContentType
from django_comments.models import Comment

from tcms.core.helpers.comments import add_comment
from tcms.tests import BasePlanCase
from tcms.tests.factories import UserFactory
from tcms.core.helpers.comments import add_comment


class TestAddComments(BasePlanCase):
Expand Down
6 changes: 2 additions & 4 deletions tcms/core/tests/test_views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,8 @@
from django.utils.translation import ugettext_lazy as _

from tcms.tests import BaseCaseRun
from tcms.tests.factories import UserFactory
from tcms.tests.factories import TestPlanFactory
from tcms.tests.factories import TestRunFactory
from tcms.tests.factories import TestExecutionFactory
from tcms.tests.factories import (TestExecutionFactory, TestPlanFactory,
TestRunFactory, UserFactory)


class TestNavigation(test.TestCase):
Expand Down
13 changes: 6 additions & 7 deletions tcms/core/views.py
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
# -*- coding: utf-8 -*-
from django import http
from django.views import i18n
from django.conf import settings
from django.template import loader
from django.shortcuts import render
from django.contrib.auth.decorators import login_required
from django.db.models import Count, Q
from django.shortcuts import render
from django.template import loader
from django.utils import translation
from django.utils.translation import trans_real
from django.utils.decorators import method_decorator
from django.views.generic.base import View
from django.views.generic.base import TemplateView
from django.contrib.auth.decorators import login_required
from django.utils.translation import trans_real
from django.views import i18n
from django.views.decorators.csrf import requires_csrf_token
from django.views.generic.base import TemplateView, View

from tcms.testplans.models import TestPlan
from tcms.testruns.models import TestRun
Expand Down
2 changes: 1 addition & 1 deletion tcms/issuetracker/base.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import re
import warnings
import threading
import warnings

from opengraph.opengraph import OpenGraph

Expand Down
4 changes: 2 additions & 2 deletions tcms/issuetracker/kiwitcms.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@

from django.template.loader import render_to_string

from tcms.bugs.views import New
from tcms.bugs.models import Bug
from tcms.issuetracker.base import IssueTrackerType
from tcms.bugs.views import New
from tcms.core.contrib.linkreference.models import LinkReference
from tcms.issuetracker.base import IssueTrackerType


class KiwiTCMS(IssueTrackerType):
Expand Down
15 changes: 6 additions & 9 deletions tcms/issuetracker/types.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,23 +5,20 @@

import os
import tempfile
from urllib.parse import urlencode, quote
from urllib.parse import quote, urlencode

import jira
import github
import bugzilla
import github
import gitlab
import jira
import redminelib

from django.conf import settings

from tcms.issuetracker import (bugzilla_integration, github_integration,
gitlab_integration, jira_integration,
redmine_integration)
from tcms.issuetracker.base import IssueTrackerType
from tcms.issuetracker.kiwitcms import KiwiTCMS # noqa
from tcms.issuetracker import bugzilla_integration
from tcms.issuetracker import jira_integration
from tcms.issuetracker import github_integration
from tcms.issuetracker import gitlab_integration
from tcms.issuetracker import redmine_integration


def from_name(name):
Expand Down
8 changes: 4 additions & 4 deletions tcms/kiwi_auth/admin.py
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# -*- coding: utf-8 -*-

from django import forms
from django.urls import reverse
from django.contrib import admin
from django.http import HttpResponseRedirect
from django.contrib.auth import get_user_model
from django.contrib.auth.models import Permission
from django.contrib.auth.admin import UserAdmin, sensitive_post_parameters_m
from django.contrib.auth.forms import UserChangeForm
from django.contrib.auth.models import Permission
from django.http import HttpResponseRedirect
from django.urls import reverse
from django.utils.translation import ugettext_lazy as _
from django.contrib.auth.admin import UserAdmin, sensitive_post_parameters_m

from tcms.utils.user import delete_user

Expand Down

0 comments on commit 1d9eb66

Please sign in to comment.