Skip to content

Commit 86ef077

Browse files
committed
Fixed #428: added CI tests against django development branch
1 parent 6cf84e9 commit 86ef077

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

oauth2_provider/backends.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,7 @@ class OAuth2Backend(object):
1212
Authenticate against an OAuth2 access token
1313
"""
1414

15-
def authenticate(self, **credentials):
16-
request = credentials.get('request')
15+
def authenticate(self, request=None, **credentials):
1716
if request is not None:
1817
valid, r = OAuthLibCore.verify_request(request, scopes=[])
1918
if valid:

tox.ini

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@ testpaths=oauth2_provider
44

55
[tox]
66
envlist =
7-
py27-django{18,19,110},
7+
py27-django{18,19,110,master},
88
py32-django18,
99
py33-django18,
10-
py34-django{18,19,110},
11-
py35-django{18,19,110},
10+
py34-django{18,19,110,master},
11+
py35-django{18,19,110,master},
1212
docs,
1313
flake8
1414

@@ -18,6 +18,7 @@ deps =
1818
django18: Django==1.8.16
1919
django19: Django==1.9.11
2020
django110: Django==1.10.3
21+
djangomaster: https://github.com/django/django/archive/master.tar.gz
2122
coverage==4.1
2223
pytest-cov==2.3.0
2324
-rrequirements/testing.txt

0 commit comments

Comments
 (0)