Skip to content

Commit 5909c8e

Browse files
Tore Lundqvisttltx
Tore Lundqvist
authored andcommitted
Add support for Python 3.4
1 parent a6d887d commit 5909c8e

File tree

7 files changed

+42
-8
lines changed

7 files changed

+42
-8
lines changed

requirements-dev@3.4.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
coverage==4.0.3
2+
flake8==2.5.4
3+
nose==1.3.7
4+
pycrypto==2.6.1
5+
requests>=2.10.0
6+
yanc==0.3.3

tests/base.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
Test suite common infrastructure.
77
'''
88

9+
import sys
910
import json
1011

1112
import requests
@@ -22,7 +23,10 @@
2223

2324
from inspect import stack, isfunction # NOQA
2425

25-
from mock import Mock # NOQA
26+
if sys.version_info >= (3, 3):
27+
from unittest.mock import Mock
28+
else:
29+
from mock import Mock # NOQA
2630
from nose.tools import nottest # NOQA
2731

2832

tests/test_service_oauth1.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,15 +17,19 @@
1717
from copy import deepcopy
1818
from hashlib import sha1
1919

20-
from mock import patch
21-
2220
import rauth
2321

2422
import requests
2523

2624
import json
2725
import pickle
2826

27+
import sys
28+
if sys.version_info >= (3, 3):
29+
from unittest.mock import patch
30+
else:
31+
from mock import patch
32+
2933

3034
class OAuth1ServiceTestCase(RauthTestCase, RequestMixin, ServiceMixin,
3135
HttpMixin):

tests/test_service_oauth2.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,18 @@
1414
from rauth.compat import parse_qsl, is_basestring
1515

1616
from copy import deepcopy
17-
from mock import patch
1817

1918
import requests
2019

2120
import json
2221
import pickle
2322

23+
import sys
24+
if sys.version_info >= (3, 3):
25+
from unittest.mock import patch
26+
else:
27+
from mock import patch
28+
2429

2530
class OAuth2ServiceTestCase(RauthTestCase, RequestMixin, ServiceMixin,
2631
HttpMixin):

tests/test_service_ofly.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@
1818
from datetime import datetime
1919
from functools import wraps
2020

21-
from mock import patch
22-
2321
import requests
2422

2523
import pickle
2624

25+
import sys
26+
if sys.version_info >= (3, 3):
27+
from unittest.mock import patch
28+
else:
29+
from mock import patch
30+
2731

2832
class OflyServiceTestCase(RauthTestCase, RequestMixin, ServiceMixin,
2933
HttpMixin):

tests/test_session.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,17 @@
99
from base import RauthTestCase
1010
from rauth.session import OAuth1Session, OAuth2Session, OflySession
1111

12-
from mock import patch
1312

1413
import requests
1514

1615
import json
1716

17+
import sys
18+
if sys.version_info >= (3, 3):
19+
from unittest.mock import patch
20+
else:
21+
from mock import patch
22+
1823

1924
class RequestMixin(object):
2025
def assert_ok(self, r):

tox.ini

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
[tox]
2-
envlist=py33,py27,py26,pypy
2+
envlist=py34,py33,py27,py26,pypy
3+
4+
[testenv:py34]
5+
deps=
6+
-r{toxinidir}/requirements-dev@3.4.txt
7+
commands=flake8 rauth tests
8+
./run-tests.sh
39

410
[testenv:py33]
511
deps=

0 commit comments

Comments
 (0)