Skip to content

Commit 62d8d04

Browse files
committed
Prefer unittest.mock over external mock package
Prefer using unittest.mock over external mock package to avoid extraneous dependencies in Python 3.3+. Install 'mock' only for older Python versions.
1 parent d75279c commit 62d8d04

File tree

5 files changed

+8
-8
lines changed

5 files changed

+8
-8
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ def readall(path):
6363
"Programming Language :: Python :: Implementation :: PyPy",
6464
],
6565
zip_safe=False,
66-
tests_require=["mock", "requests-mock"],
66+
tests_require=['mock;python_version<"3.3"', "requests-mock"],
6767
test_suite="tests",
6868
)

tests/test_core.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
import unittest
99

1010
try:
11-
import mock
12-
except ImportError:
1311
from unittest import mock
12+
except ImportError:
13+
import mock
1414

1515

1616
@mock.patch("oauthlib.oauth1.rfc5849.generate_timestamp")

tests/test_oauth1_session.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from requests_oauthlib import OAuth1Session
1010

1111
try:
12-
import mock
13-
except ImportError:
1412
from unittest import mock
13+
except ImportError:
14+
import mock
1515

1616
try:
1717
import cryptography

tests/test_oauth2_session.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
from unittest import TestCase
1010

1111
try:
12-
import mock
13-
except ImportError:
1412
from unittest import mock
13+
except ImportError:
14+
import mock
1515

1616
from oauthlib.common import urlencode
1717
from oauthlib.oauth2 import TokenExpiredError, OAuth2Error

tox.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ envlist = py27, py34, py35, py36, py37, pypy, pypy3
44
[testenv]
55
deps=
66
-r{toxinidir}/requirements.txt
7-
mock
7+
mock;python_version<"3.3"
88
coveralls
99
requests-mock
1010
commands= coverage run --source=requests_oauthlib -m unittest discover

0 commit comments

Comments
 (0)