Skip to content

drop Python2 support and old Mock requirement on Py3 #78

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.

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: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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 tests/test_outcome_response.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from lti import OutcomeResponse
from lxml import etree
import mock
from unittest import mock
import unittest

RESPONSE_XML = b"""<?xml version="1.0" encoding="UTF-8"?>
Expand Down
8 changes: 2 additions & 6 deletions tests/test_tool_provider.py
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
import unittest
from unittest.mock import Mock, patch
from urllib.parse import urlsplit

try:
from urllib.parse import urlsplit
except ImportError:
from urlparse import urlsplit # Python 2

from mock import Mock, patch
from oauthlib.common import generate_client_id
from oauthlib.common import generate_token
from oauthlib.oauth1 import SignatureOnlyEndpoint
Expand Down
5 changes: 3 additions & 2 deletions tests/test_tool_proxy.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import unittest
from mock import Mock, patch
from unittest.mock import Mock, patch

from lti import ToolProxy
import requests
import json
Expand Down Expand Up @@ -213,4 +214,4 @@ def test_register_proxy(self):

signed_request = proxy.register_proxy({'tool_profile': 'A Real Tool Profile Goes here'})

self.assertIsInstance(signed_request, requests.PreparedRequest)
self.assertIsInstance(signed_request, requests.PreparedRequest)
2 changes: 1 addition & 1 deletion tox.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[tox]
envlist = py27, py35, py36, py37, py38
envlist = py35, py36, py37, py38

[testenv]
commands =
Expand Down