Merge branch 'master' into pr/367

This commit is contained in:
mario 2017-11-12 10:36:13 +01:00
commit 658664a7d4
3 changed files with 9 additions and 8 deletions

View File

@ -2,12 +2,13 @@ language: python
python: python:
- "2.7" - "2.7"
- "3.5" - "3.5"
- "3.6"
env: env:
- DJANGO=1.8.18 - DJANGO=1.8.* DRF=3.6.*
- DJANGO=1.10.7 - DJANGO=1.10.* DRF=3.7.*
- DJANGO=1.11.1 - DJANGO=1.11.* DRF=3.7.*
install: install:
- pip install -q Django==$DJANGO - pip install -q Django==$DJANGO djangorestframework==$DRF
- pip install coveralls - pip install coveralls
- pip install -r rest_auth/tests/requirements.pip - pip install -r rest_auth/tests/requirements.pip
script: script:

View File

@ -113,7 +113,7 @@ class LogoutView(APIView):
return self.finalize_response(request, response, *args, **kwargs) return self.finalize_response(request, response, *args, **kwargs)
def post(self, request): def post(self, request, *args, **kwargs):
return self.logout(request) return self.logout(request)
def logout(self, request): def logout(self, request):
@ -193,7 +193,7 @@ class PasswordResetConfirmView(GenericAPIView):
def dispatch(self, *args, **kwargs): def dispatch(self, *args, **kwargs):
return super(PasswordResetConfirmView, self).dispatch(*args, **kwargs) return super(PasswordResetConfirmView, self).dispatch(*args, **kwargs)
def post(self, request): def post(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.data) serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
serializer.save() serializer.save()
@ -216,7 +216,7 @@ class PasswordChangeView(GenericAPIView):
def dispatch(self, *args, **kwargs): def dispatch(self, *args, **kwargs):
return super(PasswordChangeView, self).dispatch(*args, **kwargs) return super(PasswordChangeView, self).dispatch(*args, **kwargs)
def post(self, request): def post(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.data) serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True) serializer.is_valid(raise_exception=True)
serializer.save() serializer.save()

View File

@ -29,7 +29,7 @@ setup(
zip_safe=False, zip_safe=False,
install_requires=[ install_requires=[
'Django>=1.8.0', 'Django>=1.8.0',
'djangorestframework>=3.1.0', 'djangorestframework>=3.1.3',
'six>=1.9.0', 'six>=1.9.0',
], ],
extras_require={ extras_require={