Skip to content

Update 'Requester' to include new_quizzes_url attribute (#684) #688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Update 'Requester' to include new_quizzes_url attribute (#684) #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion canvasapi/paginated_list.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ def _get_next_page(self):

regex = r"(?:{}|{})(.*)".format(
re.escape(self._requester.base_url),
re.escape(self._requester.new_quizzes_url),
re.escape(getattr(self._requester, "new_quizzes_url", "")),
)

self._next_url = (
Expand Down
4 changes: 2 additions & 2 deletions canvasapi/requester.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class Requester(object):
Responsible for handling HTTP requests.
"""

def __init__(self, base_url, access_token):
def __init__(self, base_url, access_token, new_quizzes_url = None):
"""
:param base_url: The base URL of the Canvas instance's API.
:type base_url: str
Expand All @@ -35,7 +35,7 @@ def __init__(self, base_url, access_token):
# Preserve the original base url and add "/api/v1" to it
self.original_url = base_url
self.base_url = base_url + "/api/v1/"
self.new_quizzes_url = base_url + "/api/quiz/v1/"
self.new_quizzes_url = new_quizzes_url or (base_url + "/api/quiz/v1/")
self.graphql = base_url + "/api/graphql"
self.access_token = access_token
self._session = requests.Session()
Expand Down
13 changes: 13 additions & 0 deletions tests/test_assignment.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,19 @@ def test_get_submissions(self, m):
self.assertEqual(len(submission_list_by_id), 2)
self.assertIsInstance(submission_list_by_id[0], Submission)

def test_get_submissions_without_new_quizzes_url(self, m):
register_uris({"submission": ["list_submissions"]}, m)

# Explicitly remove the `new_quizzes_url` attribute to simulate the base case
if hasattr(self.canvas._Canvas__requester, "new_quizzes_url"):
del self.canvas._Canvas__requester.new_quizzes_url

submissions = self.assignment.get_submissions()
submission_list = list(submissions)

self.assertEqual(len(submission_list), 2)
self.assertIsInstance(submission_list[0], Submission)

# set_extensions()
def test_set_extensions(self, m):
register_uris({"assignment": ["set_extensions"]}, m)
Expand Down