Merge branch 'master' into update-tox

Author: jpadilla

.travis.yml

@@ -1,3 +1,5 @@
+python: '3.5'
+
 language: python
 
 sudo: false
@@ -10,30 +12,40 @@ env:
     - TOX_ENV=py27-django1.8-drf3.2
     - TOX_ENV=py27-django1.8-drf3.3
     - TOX_ENV=py27-django1.8-drf3.4
+    - TOX_ENV=py27-django1.8-drf3.5
 
     - TOX_ENV=py27-django1.9-drf3.1
     - TOX_ENV=py27-django1.9-drf3.2
     - TOX_ENV=py27-django1.9-drf3.3
     - TOX_ENV=py27-django1.9-drf3.4
+    - TOX_ENV=py27-django1.9-drf3.5
 
     - TOX_ENV=py27-django1.10-drf3.4
+    - TOX_ENV=py27-django1.10-drf3.5
 
     - TOX_ENV=py33-django1.8-drf3.1
     - TOX_ENV=py33-django1.8-drf3.2
     - TOX_ENV=py33-django1.8-drf3.3
     - TOX_ENV=py33-django1.8-drf3.4
+    - TOX_ENV=py33-django1.8-drf3.5
 
     - TOX_ENV=py34-django1.8-drf3.1
     - TOX_ENV=py34-django1.8-drf3.2
     - TOX_ENV=py34-django1.8-drf3.3
     - TOX_ENV=py34-django1.8-drf3.4
+    - TOX_ENV=py34-django1.8-drf3.5
 
     - TOX_ENV=py34-django1.9-drf3.1
     - TOX_ENV=py34-django1.9-drf3.2
     - TOX_ENV=py34-django1.9-drf3.3
     - TOX_ENV=py34-django1.9-drf3.4
+    - TOX_ENV=py34-django1.9-drf3.5
 
     - TOX_ENV=py34-django1.10-drf3.4
+    - TOX_ENV=py34-django1.10-drf3.5
+
+    - TOX_ENV=py35-django1.10-drf3.4
+    - TOX_ENV=py35-django1.10-drf3.5
 
 matrix:
   fast_finish: true

README.rst

@@ -22,9 +22,9 @@ If you want to know more about JWT, check out the following resources:
 Requirements
 ------------
 
--  Python (2.7, 3.3, 3.4)
+-  Python (2.7, 3.3, 3.4, 3.5)
 -  Django (1.8, 1.9, 1.10)
--  Django REST Framework (3.0, 3.1, 3.2, 3.3, 3.4)
+-  Django REST Framework (3.0, 3.1, 3.2, 3.3, 3.4, 3.5)
 
 Installation
 ------------

docs/index.md

@@ -27,9 +27,9 @@ If you want to know more about JWT, check out the following resources:
 
 ## Requirements
 
-- Python (2.7, 3.3, 3.4)
+- Python (2.7, 3.3, 3.4, 3.5)
 - Django (1.8, 1.9, 1.10)
-- Django REST Framework (3.0, 3.1, 3.2, 3.3, 3.4)
+- Django REST Framework (3.0, 3.1, 3.2, 3.3, 3.4, 3.5)
 
 ## Security
 
@@ -59,9 +59,9 @@ REST_FRAMEWORK = {
         'rest_framework.permissions.IsAuthenticated',
     ),
     'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
         'rest_framework.authentication.SessionAuthentication',
         'rest_framework.authentication.BasicAuthentication',
-        'rest_framework_jwt.authentication.JSONWebTokenAuthentication',
     ),
 }
 ```
@@ -72,12 +72,12 @@ In your `urls.py` add the following URL route to enable obtaining a token via a
 from rest_framework_jwt.views import obtain_jwt_token
 #...
 
-urlpatterns = patterns(
+urlpatterns = [
     '',
     # ...
 
     url(r'^api-token-auth/', obtain_jwt_token),
-)
+]
 ```
 
 You can easily test if the endpoint is working by doing the following in your terminal, if you had a user created with the username **admin** and password **password123**.
@@ -99,7 +99,7 @@ $ curl -H "Authorization: JWT <your_token>" http://localhost:8000/protected-url/
 ```
 
 ## Refresh Token
-If `JWT_ALLOW_REFRESH` is True, issued tokens can be "refreshed" to obtain a new brand token with renewed expiration time. Add a URL pattern like this:
+If `JWT_ALLOW_REFRESH` is True, **non-expired** tokens can be "refreshed" to obtain a brand new token with renewed expiration time. Add a URL pattern like this:
 ```python
     from rest_framework_jwt.views import refresh_jwt_token
     #  ...
@@ -217,7 +217,7 @@ Default is `True`.
 
 ### JWT_LEEWAY
 
-> This allows you to validate an expiration time which is in the past but no very far. For example, if you have a JWT payload with an expiration time set to 30 seconds after creation but you know that sometimes you will process it after 30 seconds, you can set a leeway of 10 seconds in order to have some margin.
+This allows you to validate an expiration time which is in the past but not very far. For example, if you have a JWT payload with an expiration time set to 30 seconds after creation but you know that sometimes you will process it after 30 seconds, you can set a leeway of 10 seconds in order to have some margin.
 
 Default is `0` seconds.
 

requirements/testing.txt

@@ -4,4 +4,4 @@ pytest-django==2.8.0
 pytest-cov==1.6
 
 # Mocking the datetime module.
-cryptography==1.2.2
+cryptography==1.2.3

rest_framework_jwt/__init__.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 __title__ = 'djangorestframework-jwt'
-__version__ = '1.8.0'
+__version__ = '1.9.0'
 __author__ = 'José Padilla'
 __license__ = 'MIT'
 __copyright__ = 'Copyright 2014-2016 Blimp LLC'

rest_framework_jwt/locale/en_US/LC_MESSAGES/django.po

@@ -47,7 +47,7 @@ msgid "User account is disabled."
 msgstr ""
 
 #: serializers.py:76
-msgid "Unable to login with provided credentials."
+msgid "Unable to log in with provided credentials."
 msgstr ""
 
 #: serializers.py:79

rest_framework_jwt/serializers.py

@@ -61,7 +61,7 @@ def validate(self, attrs):
                     'user': user
                 }
             else:
-                msg = _('Unable to login with provided credentials.')
+                msg = _('Unable to log in with provided credentials.')
                 raise serializers.ValidationError(msg)
         else:
             msg = _('Must include "{username_field}" and "password".')

setup.py

@@ -107,6 +107,7 @@ def get_package_data(package):
         'Programming Language :: Python :: 3',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP',
     ]
 )

tests/test_serializers.py

@@ -64,7 +64,7 @@ def test_invalid_credentials(self):
         is_valid = serializer.is_valid()
 
         expected_error = {
-            'non_field_errors': ['Unable to login with provided credentials.']
+            'non_field_errors': ['Unable to log in with provided credentials.']
         }
 
         self.assertFalse(is_valid)

tox.ini

@@ -1,7 +1,7 @@
 [tox]
 envlist =
        py27-{flake8,docs},
-       {py27,py33,py34}-django{1.8,1.9,1.10}-drf{3.1,3.2,3.3,3.4}
+       {py27,py33,py34,py35}-django{1.8,1.9,1.10}-drf{3.1,3.2,3.3,3.4,3.5}
 
 [testenv]
 commands = ./runtests.py --fast {posargs} --verbose
@@ -15,6 +15,7 @@ deps =
        drf3.2: djangorestframework<3.3
        drf3.3: djangorestframework<3.4
        drf3.4: djangorestframework<3.5
+       drf3.5: djangorestframework<3.6
        py27-django{1.8,1.9}-drf{3.1,3.2,3.3,3.4}: djangorestframework-oauth==1.0.1
        -rrequirements/testing.txt