From 757ce308b821ffd4cd487cce5c3f7011b5e21545 Mon Sep 17 00:00:00 2001 From: Tore Lundqvist Date: Wed, 18 May 2016 15:25:13 -0400 Subject: [PATCH] Add support for Python 3.4 --- requirements-dev@3.4.txt | 6 ++++++ tests/base.py | 2 +- tests/test_service_oauth1.py | 2 +- tests/test_service_oauth2.py | 2 +- tests/test_service_ofly.py | 2 +- tests/test_session.py | 2 +- tox.ini | 8 +++++++- 7 files changed, 18 insertions(+), 6 deletions(-) create mode 100644 requirements-dev@3.4.txt diff --git a/requirements-dev@3.4.txt b/requirements-dev@3.4.txt new file mode 100644 index 0000000..5a9f1cc --- /dev/null +++ b/requirements-dev@3.4.txt @@ -0,0 +1,6 @@ +coverage==4.0.3 +flake8==2.5.4 +nose==1.3.7 +pycrypto==2.6.1 +requests>=2.10.0 +yanc==0.3.3 diff --git a/tests/base.py b/tests/base.py index 251436c..9277b0e 100644 --- a/tests/base.py +++ b/tests/base.py @@ -22,7 +22,7 @@ from inspect import stack, isfunction # NOQA -from mock import Mock # NOQA +from unittest.mock import Mock # NOQA from nose.tools import nottest # NOQA diff --git a/tests/test_service_oauth1.py b/tests/test_service_oauth1.py index f32ccc6..ee7c065 100644 --- a/tests/test_service_oauth1.py +++ b/tests/test_service_oauth1.py @@ -17,7 +17,7 @@ from copy import deepcopy from hashlib import sha1 -from mock import patch +from unittest.mock import patch import rauth diff --git a/tests/test_service_oauth2.py b/tests/test_service_oauth2.py index fc6849c..3b1be9c 100644 --- a/tests/test_service_oauth2.py +++ b/tests/test_service_oauth2.py @@ -14,7 +14,7 @@ from rauth.compat import parse_qsl, is_basestring from copy import deepcopy -from mock import patch +from unittest.mock import patch import requests diff --git a/tests/test_service_ofly.py b/tests/test_service_ofly.py index 4fecd0a..48149d3 100644 --- a/tests/test_service_ofly.py +++ b/tests/test_service_ofly.py @@ -18,7 +18,7 @@ from datetime import datetime from functools import wraps -from mock import patch +from unittest.mock import patch import requests diff --git a/tests/test_session.py b/tests/test_session.py index 4d69722..3e83d2f 100644 --- a/tests/test_session.py +++ b/tests/test_session.py @@ -9,7 +9,7 @@ from base import RauthTestCase from rauth.session import OAuth1Session, OAuth2Session, OflySession -from mock import patch +from unittest.mock import patch import requests diff --git a/tox.ini b/tox.ini index dfaa94a..84a50c6 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,11 @@ [tox] -envlist=py33,py27,py26,pypy +envlist=py34,py33,py27,py26,pypy + +[testenv:py34] +deps= + -r{toxinidir}/requirements-dev@3.4.txt +commands=flake8 rauth tests + ./run-tests.sh [testenv:py33] deps=