Test Python 3.7 support (#288)

* Add Python 3.7 to Travis matrix
* Add Python 3.7 to supported versions
* Update complex ops tests for Python 3.7
* Exclude perf tests using tag

Author: rpkilby

.travis.yml

@@ -5,6 +5,7 @@ python:
   - "3.4"
   - "3.5"
   - "3.6"
+  - "3.7"
 
 install:
   - travis_retry pip install -U six setuptools pip wheel
@@ -17,15 +18,15 @@ after_success:
 
 matrix:
   include:
-    - python: "3.6"
+    - python: "3.7"
       env: TOXENV="performance"
       script: tox -- -v 2
-    - python: "3.6"
+    - python: "3.7"
       env: TOXENV="warnings"
-    - python: "3.6"
+    - python: "3.7"
       env: TOXENV="isort,lint"
 
-    - python: "3.6"
+    - python: "3.7"
       env: TOXENV="dist"
       script:
         - python setup.py bdist_wheel

README.rst

@@ -55,7 +55,7 @@ Features
 Requirements
 ------------
 
-* **Python**: 3.4, 3.5, 3.6
+* **Python**: 3.4, 3.5, 3.6, 3.7
 * **Django**: 1.11, 2.0, 2.1
 * **DRF**: 3.9
 * **django-filter**: 2.0

tests/perf/__init__.py

@@ -1,7 +1,7 @@
 import argparse
 from timeit import repeat
 
-from django.test import TestCase, override_settings
+from django.test import TestCase, override_settings, tag
 from rest_framework.test import APIRequestFactory
 
 from tests.perf import views
@@ -20,6 +20,7 @@
 verbosity = args.verbosity
 
 
+@tag('perf')
 class PerfTestMixin(object):
     """
     This mixin provides common setup for testing the performance differences

tests/perf/tests.py

@@ -1,3 +1,4 @@
+import sys
 from operator import attrgetter
 from urllib.parse import quote
 
@@ -12,14 +13,20 @@
 
 
 def encode(querysting):
-    return quote(querysting) \
-        .replace('-', '%2D')
+    """Mimics the encoding logic of the client."""
+    result = quote(querysting)
+
+    # Python 3.7 added '~' to the reserved character set.
+    if sys.version_info < (3, 7):
+        result = result.replace('%7E', '~')
+
+    return result
 
 
 class DecodeComplexOpsTests(TestCase):
 
     def test_docstring(self):
-        encoded = '%28a%253D1%29%20%26%20%28b%253D2%29%20%7C%20%7E%28c%253D3%29'
+        encoded = '%28a%253D1%29%20%26%20%28b%253D2%29%20%7C%20~%28c%253D3%29'
         readable = '(a%3D1) & (b%3D2) | ~(c%3D3)'
         result = [
             ('a=1', False, QuerySet.__and__),
@@ -106,7 +113,7 @@ def test_invalid_ops(self):
         ])
 
     def test_negation(self):
-        encoded = '%28a%253D1%29%20%26%20%7E%28b%253D2%29'
+        encoded = '%28a%253D1%29%20%26%20~%28b%253D2%29'
         readable = '(a%3D1) & ~(b%3D2)'
         result = [
             ('a=1', False, QuerySet.__and__),
@@ -116,8 +123,29 @@ def test_negation(self):
         self.assertEqual(encode(readable), encoded)
         self.assertEqual(decode_complex_ops(encoded), result)
 
+    def test_leading_negation(self):
+        encoded = '~%28a%253D1%29%20%26%20%28b%253D2%29'
+        readable = '~(a%3D1) & (b%3D2)'
+        result = [
+            ('a=1', True, QuerySet.__and__),
+            ('b=2', False, None),
+        ]
+
+        self.assertEqual(encode(readable), encoded)
+        self.assertEqual(decode_complex_ops(encoded), result)
+
+    def test_only_negation(self):
+        encoded = '~%28a%253D1%29'
+        readable = '~(a%3D1)'
+        result = [
+            ('a=1', True, None),
+        ]
+
+        self.assertEqual(encode(readable), encoded)
+        self.assertEqual(decode_complex_ops(encoded), result)
+
     def test_duplicate_negation(self):
-        encoded = '%28a%253D1%29%20%26%20%7E%7E%28b%253D2%29'
+        encoded = '%28a%253D1%29%20%26%20~~%28b%253D2%29'
         readable = '(a%3D1) & ~~(b%3D2)'
 
         self.assertEqual(encode(readable), encoded)
@@ -129,6 +157,19 @@ def test_duplicate_negation(self):
             "Invalid querystring operator. Matched: ' & ~'."
         ])
 
+    def test_tilde_decoding(self):
+        # Ensure decoding handles both RFC 2396 & 3986
+        encoded_rfc3986 = '~%28a%253D1%29'
+        encoded_rfc2396 = '%7E%28a%253D1%29'
+        readable = '~(a%3D1)'
+        result = [
+            ('a=1', True, None),
+        ]
+
+        self.assertEqual(encode(readable), encoded_rfc3986)
+        self.assertEqual(decode_complex_ops(encoded_rfc3986), result)
+        self.assertEqual(decode_complex_ops(encoded_rfc2396), result)
+
 
 class CombineComplexQuerysetTests(TestCase):
 

tests/test_complex_ops.py

@@ -9,7 +9,7 @@ envlist =
 unignore_outcomes = true
 
 [testenv]
-commands = coverage run manage.py test {posargs}
+commands = coverage run manage.py test --exclude-tag=perf {posargs}
 envdir = {toxworkdir}/venvs/{envname}
 setenv =
     PYTHONDONTWRITEBYTECODE=1
@@ -22,14 +22,14 @@ deps =
 
 
 [testenv:performance]
-commands = python manage.py test tests.perf {posargs}
+commands = python manage.py test --tag=perf {posargs}
 deps =
     django
     djangorestframework
 
 [testenv:warnings]
 ignore_outcome = True
-commands = python -Werror manage.py test {posargs}
+commands = python -Werror manage.py test --exclude-tag=perf {posargs}
 deps =
     https://github.com/django/django/archive/master.tar.gz
     https://github.com/tomchristie/django-rest-framework/archive/master.tar.gz
@@ -45,7 +45,7 @@ deps = flake8
 [testenv:dist]
 commands =
     twine check dist/*
-    python manage.py test --no-pkgroot {posargs}
+    python manage.py test --no-pkgroot --exclude-tag=perf {posargs}
 deps =
     django
     djangorestframework