Skip to content

Commit 4fb0db5

Browse files
Fallback on unittest.mock
1 parent 4784955 commit 4fb0db5

File tree

3 files changed

+13
-3
lines changed

3 files changed

+13
-3
lines changed

tests/test_core.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,17 @@
11
# -*- coding: utf-8 -*-
22
from __future__ import unicode_literals
3-
import mock
43
import requests
54
import requests_oauthlib
65
import oauthlib
76
import os.path
87
from io import StringIO
98
import unittest
109

10+
try:
11+
import mock
12+
except ImportError:
13+
from unittest import mock
14+
1115

1216
@mock.patch('oauthlib.oauth1.rfc5849.generate_timestamp')
1317
@mock.patch('oauthlib.oauth1.rfc5849.generate_nonce')

tests/test_oauth1_session.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
from __future__ import unicode_literals, print_function
2-
import mock
32
import unittest
43
import sys
54
import requests
@@ -9,6 +8,10 @@
98
from oauthlib.oauth1 import SIGNATURE_RSA, SIGNATURE_PLAINTEXT
109
from requests_oauthlib import OAuth1Session
1110

11+
try:
12+
import mock
13+
except ImportError:
14+
from unittest import mock
1215

1316
try:
1417
import cryptography

tests/test_oauth2_session.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,13 @@
11
from __future__ import unicode_literals
22
import json
3-
import mock
43
import time
54
from base64 import b64encode
65
from copy import deepcopy
76
from unittest import TestCase
7+
try:
8+
import mock
9+
except ImportError:
10+
from unittest import mock
811

912
from oauthlib.common import urlencode
1013
from oauthlib.oauth2 import TokenExpiredError, OAuth2Error

0 commit comments

Comments
 (0)