diff --git a/.travis.yml b/.travis.yml index 59c65a7..adb2f12 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ python: - "2.7" env: + - TOX_ENV=django.1.11 - TOX_ENV=django.1.10 - TOX_ENV=django.1.9 - TOX_ENV=django.1.8.lts diff --git a/rest_framework_extensions/etag/decorators.py b/rest_framework_extensions/etag/decorators.py index 37424c4..ecb5f7c 100644 --- a/rest_framework_extensions/etag/decorators.py +++ b/rest_framework_extensions/etag/decorators.py @@ -117,6 +117,7 @@ def calculate_etag(self, def is_if_none_match_failed(self, res_etag, etags, if_none_match): if res_etag and if_none_match: + etags = [etag.strip('"') for etag in etags] return res_etag in etags or '*' in etags else: return False diff --git a/tox.ini b/tox.ini index f278877..8e49dd7 100644 --- a/tox.ini +++ b/tox.ini @@ -1,5 +1,6 @@ [tox] envlist = + django.1.11 django.1.10 django.1.9 django.1.8.lts @@ -29,6 +30,14 @@ deps= django-guardian==1.4.4 +[testenv:django.1.11] +deps= + {[testenv]deps} + Django>=1.11,<2.0 + djangorestframework>=3.3.3 + django-guardian==1.4.4 + + [testenv:django.1.10] deps= {[testenv]deps}