Skip to content

Commit

Permalink
Fix C812,B306,Q001
Browse files Browse the repository at this point in the history
  • Loading branch information
mongkok committed Dec 24, 2017
1 parent 69cdfe3 commit f6d0541
Show file tree
Hide file tree
Showing 8 changed files with 14 additions and 14 deletions.
2 changes: 1 addition & 1 deletion graphql_jwt/middleware.py
Expand Up @@ -18,7 +18,7 @@ def __call__(self, request):
user = authenticate(request=request)
except GraphQLJWTError as err:
return JsonResponse({
'errors': [{'message': err.message}]
'errors': [{'message': str(err)}],
}, status=401)

if user is not None:
Expand Down
2 changes: 1 addition & 1 deletion graphql_jwt/mutations.py
Expand Up @@ -51,5 +51,5 @@ def mutate(cls, root, info, token, **args):

return cls(data={
'token': jwt_encode(refresh_payload),
'payload': payload
'payload': payload,
})
6 changes: 2 additions & 4 deletions graphql_jwt/settings.py
Expand Up @@ -30,14 +30,12 @@ def cast(value):

JWT_EXPIRATION_DELTA = env.timedelta(
'JWT_EXPIRATION_DELTA',
timedelta(seconds=60 * 5)
)
timedelta(seconds=60 * 5))

JWT_ALLOW_REFRESH = env.bool('JWT_ALLOW_REFRESH', True)
JWT_VERIFY_REFRESH_EXPIRATION =\
env.bool('JWT_VERIFY_REFRESH_EXPIRATION', True)

JWT_REFRESH_EXPIRATION_DELTA = env.timedelta(
'JWT_REFRESH_EXPIRATION_DELTA',
timedelta(days=7)
)
timedelta(days=7))
6 changes: 3 additions & 3 deletions graphql_jwt/utils.py
Expand Up @@ -18,7 +18,7 @@ def jwt_payload(user):

payload = {
user.USERNAME_FIELD: username,
'exp': datetime.utcnow() + settings.JWT_EXPIRATION_DELTA
'exp': datetime.utcnow() + settings.JWT_EXPIRATION_DELTA,
}

if settings.JWT_ALLOW_REFRESH:
Expand All @@ -37,7 +37,7 @@ def jwt_encode(payload):
return jwt.encode(
payload,
settings.JWT_SECRET_KEY,
settings.JWT_ALGORITHM
settings.JWT_ALGORITHM,
).decode('utf-8')


Expand All @@ -47,7 +47,7 @@ def jwt_decode(token):
settings.JWT_SECRET_KEY,
settings.JWT_VERIFY,
options={
'verify_exp': settings.JWT_VERIFY_EXPIRATION
'verify_exp': settings.JWT_VERIFY_EXPIRATION,
},
leeway=settings.JWT_LEEWAY,
audience=settings.JWT_AUDIENCE,
Expand Down
2 changes: 2 additions & 0 deletions setup.cfg
Expand Up @@ -8,6 +8,8 @@ max-line-length = 79
[tool:pytest]
django_find_project = false
DJANGO_SETTINGS_MODULE = tests.settings
flake8-ignore =
test_*.py Q001

[isort]
line_length = 79
Expand Down
6 changes: 3 additions & 3 deletions setup.py
Expand Up @@ -31,7 +31,7 @@ def get_version(package):
'Django>=1.11',
'django-environ>=0.4.4',
'graphene-django>=2.0.0',
'PyJWT>=1.5.0'
'PyJWT>=1.5.0',
],
classifiers=[
'Development Status :: 1 - Planning',
Expand All @@ -52,6 +52,6 @@ def get_version(package):
'django-environ>=0.4.4',
'coverage>=4.4',
'graphene-django>=2.0.0',
'PyJWT>=1.5.0'
]
'PyJWT>=1.5.0',
],
)
2 changes: 1 addition & 1 deletion tests/test_settings.py
Expand Up @@ -9,7 +9,7 @@
class SettingsTests(TestCase):

@patch.dict('os.environ', {
'TEST_TIMEDELTA': 'hours=1,days=1'
'TEST_TIMEDELTA': 'hours=1,days=1',
})
def test_env_timedelta_cast(self):
env = settings.Env()
Expand Down
2 changes: 1 addition & 1 deletion tests/urls.py
Expand Up @@ -3,5 +3,5 @@
from graphene_django.views import GraphQLView

urlpatterns = [
url(r'^$', GraphQLView.as_view(), name='index')
url(r'^$', GraphQLView.as_view(), name='index'),
]

0 comments on commit f6d0541

Please sign in to comment.