Add and run isort (#438)

.travis.yml

@@ -16,6 +16,7 @@ install:
 script:
   - coverage run -m unittest discover
   - black --check canvasapi tests
+  - isort --check canvasapi tests
   - flake8 canvasapi tests
   - mdl . .github
   - python scripts/alphabetic.py

canvasapi/account.py

@@ -1,8 +1,8 @@
 from canvasapi.canvas_object import CanvasObject
 from canvasapi.exceptions import CanvasException, RequiredFieldMissing
 from canvasapi.feature import Feature, FeatureFlag
-from canvasapi.grading_standard import GradingStandard
 from canvasapi.grading_period import GradingPeriod
+from canvasapi.grading_standard import GradingStandard
 from canvasapi.outcome_import import OutcomeImport
 from canvasapi.paginated_list import PaginatedList
 from canvasapi.rubric import Rubric

canvasapi/assignment.py

@@ -5,8 +5,7 @@
 from canvasapi.progress import Progress
 from canvasapi.submission import Submission
 from canvasapi.upload import Uploader
-from canvasapi.user import User
-from canvasapi.user import UserDisplay
+from canvasapi.user import User, UserDisplay
 from canvasapi.util import combine_kwargs, obj_or_id
 
 

canvasapi/canvas_object.py

@@ -1,6 +1,7 @@
+import re
 from datetime import datetime
+
 import pytz
-import re
 
 DATE_PATTERN = re.compile("[0-9]{4}-[0-9]{2}-[0-9]{2}T[0-9]{2}:[0-9]{2}:[0-9]{2}Z")
 

canvasapi/content_migration.py

@@ -147,9 +147,9 @@ def get_parent(self, **kwargs):
             or :class:`canvasapi.course.Group`,
             or :class:`canvasapi.course.User`
         """
-        from canvasapi.group import Group
-        from canvasapi.course import Course
         from canvasapi.account import Account
+        from canvasapi.course import Course
+        from canvasapi.group import Group
         from canvasapi.user import User
 
         response = self._requester.request(

canvasapi/course.py

@@ -7,36 +7,36 @@
 from canvasapi.course_epub_export import CourseEpubExport
 from canvasapi.custom_gradebook_columns import CustomGradebookColumn
 from canvasapi.discussion_topic import DiscussionTopic
+from canvasapi.exceptions import RequiredFieldMissing
+from canvasapi.feature import Feature, FeatureFlag
+from canvasapi.folder import Folder
 from canvasapi.gradebook_history import (
     Day,
     Grader,
-    SubmissionVersion,
     SubmissionHistory,
+    SubmissionVersion,
 )
-from canvasapi.grading_standard import GradingStandard
 from canvasapi.grading_period import GradingPeriod
-from canvasapi.exceptions import RequiredFieldMissing
-from canvasapi.feature import Feature, FeatureFlag
-from canvasapi.folder import Folder
+from canvasapi.grading_standard import GradingStandard
 from canvasapi.license import License
 from canvasapi.outcome_import import OutcomeImport
 from canvasapi.page import Page
 from canvasapi.paginated_list import PaginatedList
 from canvasapi.progress import Progress
 from canvasapi.quiz import QuizExtension
-from canvasapi.tab import Tab
-from canvasapi.rubric import RubricAssociation, Rubric
+from canvasapi.rubric import Rubric, RubricAssociation
 from canvasapi.submission import GroupedSubmission, Submission
+from canvasapi.tab import Tab
 from canvasapi.todo import Todo
 from canvasapi.upload import Uploader
 from canvasapi.usage_rights import UsageRights
 from canvasapi.util import (
     combine_kwargs,
-    is_multivalued,
     file_or_path,
+    is_multivalued,
+    normalize_bool,
     obj_or_id,
     obj_or_str,
-    normalize_bool,
 )
 
 

canvasapi/custom_gradebook_columns.py

@@ -1,9 +1,6 @@
 from canvasapi.canvas_object import CanvasObject
 from canvasapi.paginated_list import PaginatedList
-from canvasapi.util import (
-    combine_kwargs,
-    is_multivalued,
-)
+from canvasapi.util import combine_kwargs, is_multivalued
 
 
 class CustomGradebookColumn(CanvasObject):

canvasapi/discussion_topic.py

@@ -110,8 +110,8 @@ def get_parent(self, **kwargs):
 
         :rtype: :class:`canvasapi.group.Group` or :class:`canvasapi.course.Course`
         """
-        from canvasapi.group import Group
         from canvasapi.course import Course
+        from canvasapi.group import Group
 
         response = self._requester.request(
             "GET",

canvasapi/folder.py

@@ -1,7 +1,7 @@
 from canvasapi.canvas_object import CanvasObject
 from canvasapi.paginated_list import PaginatedList
-from canvasapi.util import combine_kwargs, obj_or_id
 from canvasapi.upload import Uploader
+from canvasapi.util import combine_kwargs, obj_or_id
 
 
 class Folder(CanvasObject):

canvasapi/group.py

@@ -1,8 +1,8 @@
 from canvasapi.canvas_object import CanvasObject
 from canvasapi.collaboration import Collaboration
 from canvasapi.discussion_topic import DiscussionTopic
-from canvasapi.folder import Folder
 from canvasapi.exceptions import RequiredFieldMissing
+from canvasapi.folder import Folder
 from canvasapi.license import License
 from canvasapi.paginated_list import PaginatedList
 from canvasapi.tab import Tab
@@ -1049,8 +1049,8 @@ def assign_members(self, sync=False, **kwargs):
         :rtype: :class:`canvasapi.paginated_list.PaginatedList` of :class:`canvasapi.user.User`
             or :class:`canvasapi.progress.Progress`
         """
-        from canvasapi.user import User
         from canvasapi.progress import Progress
+        from canvasapi.user import User
 
         if sync:
             return PaginatedList(

canvasapi/page.py

@@ -56,8 +56,8 @@ def get_parent(self, **kwargs):
 
         :rtype: :class:`canvasapi.group.Group` or :class:`canvasapi.course.Course`
         """
-        from canvasapi.group import Group
         from canvasapi.course import Course
+        from canvasapi.group import Group
 
         response = self._requester.request(
             "GET",
@@ -208,8 +208,8 @@ def get_parent(self, **kwargs):
 
         :rtype: :class:`canvasapi.group.Group` or :class:`canvasapi.course.Course`
         """
-        from canvasapi.group import Group
         from canvasapi.course import Course
+        from canvasapi.group import Group
 
         response = self._requester.request(
             "GET",

canvasapi/poll.py

@@ -1,5 +1,5 @@
-from canvasapi.exceptions import RequiredFieldMissing
 from canvasapi.canvas_object import CanvasObject
+from canvasapi.exceptions import RequiredFieldMissing
 from canvasapi.paginated_list import PaginatedList
 from canvasapi.poll_choice import PollChoice
 from canvasapi.poll_session import PollSession

canvasapi/poll_choice.py

@@ -1,5 +1,5 @@
-from canvasapi.exceptions import RequiredFieldMissing
 from canvasapi.canvas_object import CanvasObject
+from canvasapi.exceptions import RequiredFieldMissing
 from canvasapi.util import combine_kwargs
 
 

canvasapi/poll_session.py

@@ -1,7 +1,7 @@
-from canvasapi.exceptions import RequiredFieldMissing
 from canvasapi.canvas_object import CanvasObject
-from canvasapi.util import combine_kwargs, obj_or_id
+from canvasapi.exceptions import RequiredFieldMissing
 from canvasapi.poll_submission import PollSubmission
+from canvasapi.util import combine_kwargs, obj_or_id
 
 
 class PollSession(CanvasObject):

canvasapi/requester.py

@@ -1,5 +1,5 @@
-from datetime import datetime
 import logging
+from datetime import datetime
 from pprint import pformat
 
 import requests
@@ -16,7 +16,6 @@
 )
 from canvasapi.util import clean_headers
 
-
 logger = logging.getLogger(__name__)
 
 

canvasapi/section.py

@@ -2,7 +2,7 @@
 from canvasapi.paginated_list import PaginatedList
 from canvasapi.progress import Progress
 from canvasapi.submission import GroupedSubmission, Submission
-from canvasapi.util import combine_kwargs, obj_or_id, normalize_bool
+from canvasapi.util import combine_kwargs, normalize_bool, obj_or_id
 
 
 class Section(CanvasObject):

canvasapi/user.py

@@ -3,9 +3,9 @@
 from canvasapi.communication_channel import CommunicationChannel
 from canvasapi.feature import Feature, FeatureFlag
 from canvasapi.folder import Folder
+from canvasapi.license import License
 from canvasapi.paginated_list import PaginatedList
 from canvasapi.pairing_code import PairingCode
-from canvasapi.license import License
 from canvasapi.upload import Uploader
 from canvasapi.usage_rights import UsageRights
 from canvasapi.util import combine_kwargs, obj_or_id, obj_or_str

scripts/run_tests.sh

@@ -4,6 +4,7 @@ coverage run -m unittest discover
 coverage report
 coverage html
 black --check canvasapi tests
+isort --check canvasapi tests
 flake8 canvasapi tests
 mdl . .github
 python scripts/alphabetic.py

setup.cfg

@@ -3,3 +3,6 @@ source = canvasapi/
 
 [flake8]
 max-line-length = 99
+
+[isort]
+profile=black

tests/test_account.py

@@ -1,7 +1,7 @@
 import datetime
-import pytz
 import unittest
 
+import pytz
 import requests_mock
 
 from canvasapi import Canvas
@@ -13,13 +13,14 @@
     Role,
     SSOSettings,
 )
-from canvasapi.authentication_provider import AuthenticationProvider
 from canvasapi.authentication_event import AuthenticationEvent
+from canvasapi.authentication_provider import AuthenticationProvider
+from canvasapi.content_migration import ContentMigration, Migrator
 from canvasapi.course import Course
 from canvasapi.enrollment import Enrollment
 from canvasapi.enrollment_term import EnrollmentTerm
-from canvasapi.external_tool import ExternalTool
 from canvasapi.exceptions import CanvasException, RequiredFieldMissing
+from canvasapi.external_tool import ExternalTool
 from canvasapi.feature import Feature, FeatureFlag
 from canvasapi.grading_period import GradingPeriod
 from canvasapi.grading_standard import GradingStandard
@@ -32,7 +33,6 @@
 from canvasapi.scope import Scope
 from canvasapi.sis_import import SisImport
 from canvasapi.user import User
-from canvasapi.content_migration import ContentMigration, Migrator
 from tests import settings
 from tests.util import register_uris
 

tests/test_assignment.py

@@ -6,17 +6,17 @@
 from canvasapi import Canvas
 from canvasapi.assignment import (
     Assignment,
+    AssignmentExtension,
     AssignmentGroup,
     AssignmentOverride,
-    AssignmentExtension,
 )
 from canvasapi.exceptions import CanvasException, RequiredFieldMissing
 from canvasapi.peer_review import PeerReview
 from canvasapi.progress import Progress
 from canvasapi.submission import Submission
 from canvasapi.user import UserDisplay
 from tests import settings
-from tests.util import register_uris, cleanup_file
+from tests.util import cleanup_file, register_uris
 
 
 @requests_mock.Mocker()

tests/test_blueprint.py

@@ -3,8 +3,7 @@
 import requests_mock
 
 from canvasapi import Canvas
-from canvasapi.blueprint import BlueprintMigration
-from canvasapi.blueprint import ChangeRecord
+from canvasapi.blueprint import BlueprintMigration, ChangeRecord
 from canvasapi.course import Course
 from canvasapi.paginated_list import PaginatedList
 from tests import settings

tests/test_course.py

@@ -1,51 +1,50 @@
 import unittest
-from urllib.parse import quote
 import uuid
 import warnings
+from urllib.parse import quote
 
 import requests
 import requests_mock
 
 from canvasapi import Canvas
 from canvasapi.assignment import Assignment, AssignmentGroup, AssignmentOverride
-from canvasapi.blueprint import BlueprintSubscription
-from canvasapi.blueprint import BlueprintTemplate
-from canvasapi.course import Course, CourseNickname, Page, LatePolicy
+from canvasapi.blueprint import BlueprintSubscription, BlueprintTemplate
+from canvasapi.content_export import ContentExport
+from canvasapi.content_migration import ContentMigration, Migrator
+from canvasapi.course import Course, CourseNickname, LatePolicy, Page
+from canvasapi.course_epub_export import CourseEpubExport
+from canvasapi.custom_gradebook_columns import CustomGradebookColumn
 from canvasapi.discussion_topic import DiscussionTopic
-from canvasapi.gradebook_history import (
-    Day,
-    Grader,
-    SubmissionVersion,
-    SubmissionHistory,
-)
-from canvasapi.grading_standard import GradingStandard
 from canvasapi.enrollment import Enrollment
-from canvasapi.course_epub_export import CourseEpubExport
-from canvasapi.exceptions import ResourceDoesNotExist, RequiredFieldMissing
+from canvasapi.exceptions import RequiredFieldMissing, ResourceDoesNotExist
 from canvasapi.external_feed import ExternalFeed
 from canvasapi.external_tool import ExternalTool
 from canvasapi.feature import Feature, FeatureFlag
 from canvasapi.file import File
 from canvasapi.folder import Folder
+from canvasapi.gradebook_history import (
+    Day,
+    Grader,
+    SubmissionHistory,
+    SubmissionVersion,
+)
 from canvasapi.grading_period import GradingPeriod
+from canvasapi.grading_standard import GradingStandard
 from canvasapi.group import Group, GroupCategory
 from canvasapi.license import License
 from canvasapi.module import Module
 from canvasapi.outcome import OutcomeGroup, OutcomeLink
 from canvasapi.outcome_import import OutcomeImport
 from canvasapi.paginated_list import PaginatedList
 from canvasapi.progress import Progress
-from canvasapi.quiz import Quiz, QuizExtension, QuizAssignmentOverrideSet
+from canvasapi.quiz import Quiz, QuizAssignmentOverrideSet, QuizExtension
 from canvasapi.rubric import Rubric, RubricAssociation
 from canvasapi.section import Section
 from canvasapi.submission import GroupedSubmission, Submission
 from canvasapi.tab import Tab
 from canvasapi.todo import Todo
-from canvasapi.user import User
 from canvasapi.usage_rights import UsageRights
-from canvasapi.content_migration import ContentMigration, Migrator
-from canvasapi.content_export import ContentExport
-from canvasapi.custom_gradebook_columns import CustomGradebookColumn
+from canvasapi.user import User
 from tests import settings
 from tests.util import cleanup_file, register_uris
 

tests/test_discussion_topic.py

@@ -4,7 +4,7 @@
 
 from canvasapi import Canvas
 from canvasapi.course import Course
-from canvasapi.discussion_topic import DiscussionTopic, DiscussionEntry
+from canvasapi.discussion_topic import DiscussionEntry, DiscussionTopic
 from canvasapi.exceptions import Forbidden
 from canvasapi.group import Group
 from tests import settings

tests/test_file.py

@@ -6,8 +6,7 @@
 from canvasapi import Canvas
 from canvasapi.file import File
 from tests import settings
-from tests.util import cleanup_file
-from tests.util import register_uris
+from tests.util import cleanup_file, register_uris
 
 
 @requests_mock.Mocker()

tests/test_folder.py

@@ -7,7 +7,7 @@
 from canvasapi.file import File
 from canvasapi.folder import Folder
 from tests import settings
-from tests.util import register_uris, cleanup_file
+from tests.util import cleanup_file, register_uris
 
 
 @requests_mock.Mocker()