From 540a0850017e836f13a8c566abfdf7f6a952ffe3 Mon Sep 17 00:00:00 2001 From: Wan Liuyang Date: Wed, 11 Dec 2019 00:54:59 +0800 Subject: [PATCH] Fix isort - add known first and third party --- .isort.cfg | 4 +++- github/AuthenticatedUser.py | 3 ++- github/Authorization.py | 3 ++- github/Branch.py | 3 ++- github/Commit.py | 3 ++- github/CommitComment.py | 3 ++- github/Gist.py | 3 ++- github/GistComment.py | 3 ++- github/GitRef.py | 3 ++- github/GitRelease.py | 3 ++- github/GitReleaseAsset.py | 3 ++- github/Hook.py | 3 ++- github/InputFileContent.py | 3 ++- github/InputGitAuthor.py | 3 ++- github/InputGitTreeElement.py | 3 ++- github/Issue.py | 5 +++-- github/IssueComment.py | 3 ++- github/Label.py | 3 ++- github/MainClass.py | 9 +++++---- github/Migration.py | 3 ++- github/Milestone.py | 3 ++- github/NamedUser.py | 3 ++- github/Organization.py | 3 ++- github/Project.py | 3 ++- github/ProjectColumn.py | 3 ++- github/PullRequest.py | 5 +++-- github/PullRequestComment.py | 3 ++- github/PullRequestReview.py | 3 ++- github/RateLimit.py | 3 ++- github/Repository.py | 7 ++++--- github/Team.py | 3 ++- tests/BadAttributes.py | 3 ++- tests/Exceptions.py | 3 ++- tests/Framework.py | 3 ++- tests/GithubIntegration.py | 1 + tests/Retry.py | 3 ++- 36 files changed, 79 insertions(+), 42 deletions(-) diff --git a/.isort.cfg b/.isort.cfg index 0ac773da..1417b118 100644 --- a/.isort.cfg +++ b/.isort.cfg @@ -3,4 +3,6 @@ multi_line_output=3 include_trailing_comma=True force_grid_wrap=0 use_parentheses=True -line_length=88 \ No newline at end of file +line_length=88 +known_third_party=deprecated,httpretty,jwt,parameterized,requests,setuptools,six,urllib3 +known_first_party=github diff --git a/github/AuthenticatedUser.py b/github/AuthenticatedUser.py index ebbfcc0c..9538157f 100644 --- a/github/AuthenticatedUser.py +++ b/github/AuthenticatedUser.py @@ -44,6 +44,8 @@ from __future__ import absolute_import import datetime +import six + import github.Authorization import github.Event import github.Gist @@ -59,7 +61,6 @@ import github.PaginatedList import github.Plan import github.Repository import github.UserKey -import six from . import Consts diff --git a/github/Authorization.py b/github/Authorization.py index f5bfe280..e5b33f3b 100644 --- a/github/Authorization.py +++ b/github/Authorization.py @@ -32,9 +32,10 @@ from __future__ import absolute_import +import six + import github.AuthorizationApplication import github.GithubObject -import six class Authorization(github.GithubObject.CompletableGithubObject): diff --git a/github/Branch.py b/github/Branch.py index 9e1a0695..60eb310b 100644 --- a/github/Branch.py +++ b/github/Branch.py @@ -35,12 +35,13 @@ from __future__ import absolute_import +import six + import github.BranchProtection import github.Commit import github.GithubObject import github.RequiredPullRequestReviews import github.RequiredStatusChecks -import six from . import Consts diff --git a/github/Commit.py b/github/Commit.py index 733f6183..27cac62f 100644 --- a/github/Commit.py +++ b/github/Commit.py @@ -34,6 +34,8 @@ from __future__ import absolute_import +import six + import github.CommitCombinedStatus import github.CommitComment import github.CommitStats @@ -43,7 +45,6 @@ import github.GitCommit import github.GithubObject import github.NamedUser import github.PaginatedList -import six class Commit(github.GithubObject.CompletableGithubObject): diff --git a/github/CommitComment.py b/github/CommitComment.py index ff3059f1..8dbce3b1 100644 --- a/github/CommitComment.py +++ b/github/CommitComment.py @@ -34,9 +34,10 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.NamedUser -import six from . import Consts diff --git a/github/Gist.py b/github/Gist.py index d899eaae..a4e682f7 100644 --- a/github/Gist.py +++ b/github/Gist.py @@ -35,13 +35,14 @@ from __future__ import absolute_import +import six + import github.GistComment import github.GistFile import github.GistHistoryState import github.GithubObject import github.NamedUser import github.PaginatedList -import six class Gist(github.GithubObject.CompletableGithubObject): diff --git a/github/GistComment.py b/github/GistComment.py index a584421c..dcdf10da 100644 --- a/github/GistComment.py +++ b/github/GistComment.py @@ -32,9 +32,10 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.NamedUser -import six class GistComment(github.GithubObject.CompletableGithubObject): diff --git a/github/GitRef.py b/github/GitRef.py index 797e2384..2c64ff9c 100644 --- a/github/GitRef.py +++ b/github/GitRef.py @@ -32,9 +32,10 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.GitObject -import six class GitRef(github.GithubObject.CompletableGithubObject): diff --git a/github/GitRelease.py b/github/GitRelease.py index 73be5c68..351f3bd9 100644 --- a/github/GitRelease.py +++ b/github/GitRelease.py @@ -39,10 +39,11 @@ from __future__ import absolute_import from os.path import basename +import six + import github.GithubObject import github.GitReleaseAsset import github.NamedUser -import six class GitRelease(github.GithubObject.CompletableGithubObject): diff --git a/github/GitReleaseAsset.py b/github/GitReleaseAsset.py index f831bac4..158a0421 100644 --- a/github/GitReleaseAsset.py +++ b/github/GitReleaseAsset.py @@ -27,9 +27,10 @@ from __future__ import absolute_import -import github.GithubObject import six +import github.GithubObject + class GitReleaseAsset(github.GithubObject.CompletableGithubObject): """ diff --git a/github/Hook.py b/github/Hook.py index 53ae578a..423a6029 100644 --- a/github/Hook.py +++ b/github/Hook.py @@ -33,9 +33,10 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.HookResponse -import six class Hook(github.GithubObject.CompletableGithubObject): diff --git a/github/InputFileContent.py b/github/InputFileContent.py index 734f4fe3..7c2f578b 100644 --- a/github/InputFileContent.py +++ b/github/InputFileContent.py @@ -30,9 +30,10 @@ from __future__ import absolute_import -import github.GithubObject import six +import github.GithubObject + class InputFileContent(object): """ diff --git a/github/InputGitAuthor.py b/github/InputGitAuthor.py index f78997eb..30676e05 100644 --- a/github/InputGitAuthor.py +++ b/github/InputGitAuthor.py @@ -32,9 +32,10 @@ from __future__ import absolute_import -import github.GithubObject import six +import github.GithubObject + class InputGitAuthor(object): """ diff --git a/github/InputGitTreeElement.py b/github/InputGitTreeElement.py index 22732e89..b4a8c044 100644 --- a/github/InputGitTreeElement.py +++ b/github/InputGitTreeElement.py @@ -30,9 +30,10 @@ from __future__ import absolute_import -import github.GithubObject import six +import github.GithubObject + class InputGitTreeElement(object): """ diff --git a/github/Issue.py b/github/Issue.py index e2d6be80..749c8ef3 100644 --- a/github/Issue.py +++ b/github/Issue.py @@ -46,6 +46,9 @@ from __future__ import absolute_import import datetime +import six +import six.moves.urllib.parse + import github.GithubObject import github.IssueComment import github.IssueEvent @@ -56,8 +59,6 @@ import github.NamedUser import github.PaginatedList import github.Reaction import github.Repository -import six -import six.moves.urllib.parse from . import Consts diff --git a/github/IssueComment.py b/github/IssueComment.py index 57aa5d30..e25f48f9 100644 --- a/github/IssueComment.py +++ b/github/IssueComment.py @@ -35,9 +35,10 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.NamedUser -import six from . import Consts diff --git a/github/Label.py b/github/Label.py index b28f02b0..b48d1f74 100644 --- a/github/Label.py +++ b/github/Label.py @@ -33,10 +33,11 @@ from __future__ import absolute_import -import github.GithubObject import six import six.moves.urllib.parse +import github.GithubObject + from . import Consts diff --git a/github/MainClass.py b/github/MainClass.py index 8e6ca1d1..2d7757c3 100644 --- a/github/MainClass.py +++ b/github/MainClass.py @@ -54,16 +54,17 @@ import datetime import pickle import time +import jwt +import requests +import six +import urllib3 + import github.Gist import github.GithubObject import github.License import github.NamedUser import github.PaginatedList import github.Topic -import jwt -import requests -import six -import urllib3 from . import ( AuthenticatedUser, diff --git a/github/Migration.py b/github/Migration.py index 99be3672..4365775f 100644 --- a/github/Migration.py +++ b/github/Migration.py @@ -34,10 +34,11 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.NamedUser import github.PaginatedList -import six from . import Consts diff --git a/github/Milestone.py b/github/Milestone.py index 1fd70593..647aedf4 100644 --- a/github/Milestone.py +++ b/github/Milestone.py @@ -34,11 +34,12 @@ from __future__ import absolute_import import datetime +import six + import github.GithubObject import github.Label import github.NamedUser import github.PaginatedList -import six class Milestone(github.GithubObject.CompletableGithubObject): diff --git a/github/NamedUser.py b/github/NamedUser.py index a881397a..686dd09a 100644 --- a/github/NamedUser.py +++ b/github/NamedUser.py @@ -41,6 +41,8 @@ from __future__ import absolute_import import datetime +import six + import github.Event import github.Gist import github.GithubObject @@ -50,7 +52,6 @@ import github.PaginatedList import github.Permissions import github.Plan import github.Repository -import six class NamedUser(github.GithubObject.CompletableGithubObject): diff --git a/github/Organization.py b/github/Organization.py index 9ea12024..6ff06102 100644 --- a/github/Organization.py +++ b/github/Organization.py @@ -45,6 +45,8 @@ from __future__ import absolute_import import datetime +import six + import github.Event import github.GithubObject import github.NamedUser @@ -53,7 +55,6 @@ import github.Plan import github.Project import github.Repository import github.Team -import six from . import Consts diff --git a/github/Project.py b/github/Project.py index 9e78bd25..9bc4ec01 100644 --- a/github/Project.py +++ b/github/Project.py @@ -24,9 +24,10 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.ProjectColumn -import six from . import Consts diff --git a/github/ProjectColumn.py b/github/ProjectColumn.py index 372fa992..7301508d 100644 --- a/github/ProjectColumn.py +++ b/github/ProjectColumn.py @@ -24,10 +24,11 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.Project import github.ProjectCard -import six from . import Consts diff --git a/github/PullRequest.py b/github/PullRequest.py index 0bb4a82e..61aa7fae 100644 --- a/github/PullRequest.py +++ b/github/PullRequest.py @@ -46,6 +46,9 @@ from __future__ import absolute_import import datetime +import six +import six.moves.urllib.parse + import github.Commit import github.File import github.GithubObject @@ -56,8 +59,6 @@ import github.PullRequestComment import github.PullRequestMergeStatus import github.PullRequestPart import github.PullRequestReview -import six -import six.moves.urllib.parse from . import Consts diff --git a/github/PullRequestComment.py b/github/PullRequestComment.py index 43bfc17d..4b5dcaa8 100644 --- a/github/PullRequestComment.py +++ b/github/PullRequestComment.py @@ -36,9 +36,10 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.NamedUser -import six from . import Consts diff --git a/github/PullRequestReview.py b/github/PullRequestReview.py index 77057378..edd53de4 100644 --- a/github/PullRequestReview.py +++ b/github/PullRequestReview.py @@ -28,9 +28,10 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.NamedUser -import six class PullRequestReview(github.GithubObject.CompletableGithubObject): diff --git a/github/RateLimit.py b/github/RateLimit.py index ba32b619..eba10a7b 100644 --- a/github/RateLimit.py +++ b/github/RateLimit.py @@ -29,9 +29,10 @@ from __future__ import absolute_import +from deprecated import deprecated + import github.GithubObject import github.Rate -from deprecated import deprecated class RateLimit(github.GithubObject.NonCompletableGithubObject): diff --git a/github/Repository.py b/github/Repository.py index 9c3ab8e8..0faea720 100644 --- a/github/Repository.py +++ b/github/Repository.py @@ -91,6 +91,10 @@ import collections import datetime from base64 import b64encode +import six +import six.moves.urllib.parse +from deprecated import deprecated + import github.Branch import github.Clones import github.Commit @@ -133,9 +137,6 @@ import github.StatsPunchCard import github.Tag import github.Team import github.View -import six -import six.moves.urllib.parse -from deprecated import deprecated from . import Consts diff --git a/github/Team.py b/github/Team.py index 2ed2a1e6..8c28a758 100644 --- a/github/Team.py +++ b/github/Team.py @@ -43,13 +43,14 @@ from __future__ import absolute_import +import six + import github.GithubObject import github.NamedUser import github.Organization import github.PaginatedList import github.Repository import github.TeamDiscussion -import six from . import Consts diff --git a/tests/BadAttributes.py b/tests/BadAttributes.py index 77884a35..ed474b30 100755 --- a/tests/BadAttributes.py +++ b/tests/BadAttributes.py @@ -30,9 +30,10 @@ from __future__ import absolute_import import datetime -import github import six +import github + from . import Framework diff --git a/tests/Exceptions.py b/tests/Exceptions.py index a593478c..bed594c8 100644 --- a/tests/Exceptions.py +++ b/tests/Exceptions.py @@ -35,9 +35,10 @@ from __future__ import absolute_import import pickle +from six.moves import range + import github from github.GithubException import IncompletableObject -from six.moves import range from . import Framework diff --git a/tests/Framework.py b/tests/Framework.py index 489390dc..e49fde84 100644 --- a/tests/Framework.py +++ b/tests/Framework.py @@ -44,12 +44,13 @@ import os import traceback import unittest -import github import httpretty import six from requests.structures import CaseInsensitiveDict from urllib3.util import Url +import github + def readLine(file_): line = file_.readline() diff --git a/tests/GithubIntegration.py b/tests/GithubIntegration.py index ff5846ad..fabb0a26 100644 --- a/tests/GithubIntegration.py +++ b/tests/GithubIntegration.py @@ -8,6 +8,7 @@ import unittest import jwt import requests # NOQA + from github.GithubObject import GithubObject private_key = """ diff --git a/tests/Retry.py b/tests/Retry.py index dfd945b5..80f8f6e7 100644 --- a/tests/Retry.py +++ b/tests/Retry.py @@ -28,11 +28,12 @@ from __future__ import absolute_import -import github import requests import urllib3 from httpretty import httpretty +import github + from . import Framework REPO_NAME = "PyGithub/PyGithub"