Merge pull request #62 from peopledoc/freshen-up

Joachim Jablon · web-flow · commit f45504eb26f7 · 2020-07-27T10:19:55.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,13 @@
-*.pyc
-*~
-*.egg-info
-/var/
+__pycache__
 .coverage
+.DS_Store
+.mypy_cache
+.pytest_cache
+.tox
+.venv
+*.egg-info
+*.pyc
+build
+dist
+docs/_build
+htmlcov
diff --git a/.travis.yml b/.travis.yml
@@ -4,16 +4,19 @@ sudo: true
 services:
   - postgresql
 python:
-  - 2.7
-  - 3.5
   - 3.6
   - 3.7
   - 3.8
 install:
-  - pip install tox
-  - pip install -q tox-travis
+  - pip install tox tox-travis
 script:
-    - tox
+  - tox
+env:
+  global:
+    PGDATABASE: django_generic_filters
+    PGHOST: localhost
+    PGUSER: postgres
+
 
 stages:
   - lint
diff --git a/README.rst b/README.rst
@@ -15,9 +15,9 @@ filter the results:
 * validate the user's input using a Django form;
 * filter the Django view's queryset using form's cleaned data.
 
-.. image:: https://secure.travis-ci.org/novafloss/django-generic-filters.png?branch=master
+.. image:: https://secure.travis-ci.org/peopledoc/django-generic-filters.png?branch=master
    :alt: Build Status
-   :target: https://secure.travis-ci.org/novafloss/django-generic-filters
+   :target: https://secure.travis-ci.org/peopledoc/django-generic-filters
 
 
 *******
diff --git a/demo/demoproject/filter/templates/user/user_list.html b/demo/demoproject/filter/templates/user/user_list.html
@@ -1,4 +1,4 @@
-{% load staticfiles paginator i18n %}
+{% load static paginator i18n %}
 <html>
 	<head>
         <title>django-generic-filters demo</title>
@@ -39,7 +39,7 @@ <h3>{% trans "All users" %} ({{ paginator.count }})</h3>
                             </div>
                       </div>
                     {% endblock %}
-                    
+
                     <table class="table table-striped">
                       <thead>
                         <tr>
diff --git a/demo/demoproject/filter/views.py b/demo/demoproject/filter/views.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 
 from django_genericfilters.views import FilteredListView
 
diff --git a/demo/demoproject/settings.py b/demo/demoproject/settings.py
@@ -20,11 +20,9 @@
 DATABASES = {
     "default": {
         "ENGINE": "django.db.backends.postgresql_psycopg2",
-        "NAME": "test",
-        "USER": environ.get("DJANGO_DB_USER", environ.get("USER")),
-        'PASSWORD': environ.get("DJANGO_DB_PASSWORD", ""),
-        'HOST': '',
-        'PORT': '',
+        "NAME": environ.get("PGDATABASE", "django_generic_filters")
+        # Configure database using standard PG* environment variables
+        # https://www.postgresql.org/docs/current/libpq-envars.html
     }
 }
 
diff --git a/demo/setup.py b/demo/setup.py
@@ -1,6 +1,5 @@
-# -*- coding: utf-8 -*-
 import os
-from setuptools import setup
+from setuptools import setup, find_packages
 
 
 def read_relative_file(filename):
@@ -13,11 +12,11 @@ def read_relative_file(filename):
 NAME = 'django-genericfilters-demo'
 README = read_relative_file('README')
 VERSION = '0.1'
-PACKAGES = ['demoproject']
+PACKAGES = find_packages()
 REQUIRES = [
     'django-generic-filters',
     'mock',
-    'Django>=1.8,<1.12',
+    'Django',
     'coverage', ]
 
 
@@ -27,8 +26,7 @@ def read_relative_file(filename):
       long_description=README,
       classifiers=['Development Status :: 1 - Planning',
                    'License :: OSI Approved :: BSD License',
-                   'Programming Language :: Python :: 2',
-                   'Programming Language :: Python :: 2.7',
+                   'Programming Language :: Python :: 3',
                    'Framework :: Django',
                    ],
       keywords='class-based view, generic view, filters',
diff --git a/django_genericfilters/fields.py b/django_genericfilters/fields.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
diff --git a/django_genericfilters/forms.py b/django_genericfilters/forms.py
@@ -1,11 +1,8 @@
-# -*- coding: utf-8 -*-
 """
 django generic filters implement a set of mixin to work with ordered
 and filtered queryset.
 
 """
-from six import string_types
-
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
@@ -69,7 +66,7 @@ def get_order_by_choices(self):
 
 
 def clean_yesno(value):
-    if isinstance(value, string_types):
+    if isinstance(value, str):
         return {"yes": True, "no": False}.get(value, value)
 
     return value
diff --git a/django_genericfilters/templates/genericfilters/filter_list.html b/django_genericfilters/templates/genericfilters/filter_list.html
@@ -1,4 +1,4 @@
-{% load i18n updateurl utils staticfiles %}
+{% load i18n updateurl utils static %}
 <link rel="stylesheet" href="{% static 'css/filters_list.css' %}" />
 <form method="GET" id="search_form" style="display: block;">
   <ul class="nav nav-list">
diff --git a/django_genericfilters/templatetags/updateurl.py b/django_genericfilters/templatetags/updateurl.py
@@ -15,10 +15,9 @@
    {% update_query_string with page=paginator.next_page %}
 
 """
-import six
-from six.moves import urllib
 
 import re
+import urllib
 
 from django import template
 from django.template.base import FilterExpression
@@ -102,17 +101,17 @@ def render(self, context):
         try:
             url = url.resolve(context)
         except AttributeError:
-            url = six.text_type(url)
+            url = str(url)
         updates = {}
-        for key, value in six.iteritems(self.qs_updates):
+        for key, value in self.qs_updates.items():
             try:
                 key = key.resolve(context)
             except AttributeError:
-                key = six.text_type(key)
+                key = str(key)
             try:
                 value = value.resolve(context)
             except AttributeError:
-                value = six.text_type(value)
+                value = str(value)
             updates[key] = value
         new_url = update_query_string(url, updates)
         try:
diff --git a/django_genericfilters/tests/test_fields.py b/django_genericfilters/tests/test_fields.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 
 from django import forms
diff --git a/django_genericfilters/tests/test_forms.py b/django_genericfilters/tests/test_forms.py
@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 import unittest
 
 from django import forms
diff --git a/django_genericfilters/tests/test_templatetags.py b/django_genericfilters/tests/test_templatetags.py
@@ -1,12 +1,12 @@
 import unittest
 
 from django import forms
-from django.template.base import TOKEN_TEXT, Parser, Token, Variable
-
-import mock
+from django.template import Template, Context
+from django.template.base import Parser, Variable
+from django.test import RequestFactory
 
 from django_genericfilters.templatetags.updateurl import (
-    token_kwargs, token_value, tag_update_query_string, update_query_string
+    token_kwargs, token_value, update_query_string
 )
 from django_genericfilters.templatetags.utils import is_checkbox
 
@@ -40,18 +40,16 @@ def test_update_query_string(self):
             '/foo/?bar=created')
 
     def test_tag_update_query_string(self):
-        request = mock.Mock()
-        request.get_full_path = mock.Mock(return_value='/fake')
-        parser = Parser('')
-        token = Token(TOKEN_TEXT, 'tag with "page"="2"')
-        node = tag_update_query_string(parser, token)
-        self.assertEqual(
-            node.render({'request': request}),
-            u'/fake?page=2')
-        token = Token(TOKEN_TEXT, 'tag with page=num_page')
-        node = tag_update_query_string(parser, token)
+        template = Template(
+            "{% load updateurl %}{% update_query_string with page=num_page %}"
+        )
         self.assertEqual(
-            node.render({'request': request, 'page': 'page', 'num_page': 2}),
+            template.render(
+                Context(
+                    {'request': RequestFactory().get("/fake"),
+                     'page': 'page', 'num_page': 2}
+                )
+            ),
             u'/fake?page=2')
 
     def test_is_checkbox(self):
diff --git a/django_genericfilters/tests/test_views.py b/django_genericfilters/tests/test_views.py
@@ -1,4 +1,4 @@
-import sys
+import urllib
 
 from django import forms
 from django.db import models
@@ -8,7 +8,6 @@
 
 from django_genericfilters import views
 from django_genericfilters.forms import FilteredForm
-from six.moves import urllib
 
 
 def setup_view(view, request, *args, **kwargs):
@@ -43,14 +42,6 @@ class StatusModel(models.Model):
 
 class FilteredViewTestCase(TestCase):
 
-    def assertIn(self, a, b, msg=None):
-        if sys.version_info[:2] == (2, 6):
-            # for 2.6 compatibility
-            if a not in b:
-                self.fail("%s is not in %b" % (repr(a), repr(b)))
-        else:
-            super(FilteredViewTestCase, self).assertIn(a, b, msg=msg)
-
     class QueryModel(models.Model):
         """
         Define a dummy model for this test case
@@ -122,7 +113,7 @@ def test_default_order_fallback_form_valid(self):
 
         view.form.is_valid()
         queryset = view.form_valid(view.form)
-        self.assertEqual(queryset.query.order_by, [])
+        self.assertEqual(list(queryset.query.order_by), [])
 
     def test_default_order_fallback_form_invalid(self):
         """Queryset is unordered if no default_order or data (invalid form)."""
@@ -134,7 +125,7 @@ def test_default_order_fallback_form_invalid(self):
 
         view.form.is_valid()
         queryset = view.form_invalid(view.form)
-        self.assertEqual(queryset.query.order_by, [])
+        self.assertEqual(list(queryset.query.order_by), [])
 
     def test_default_order_fallback_form_empty(self):
         """Queryset is unordered if no default_order or data (empty form)."""
@@ -145,7 +136,7 @@ def test_default_order_fallback_form_empty(self):
             request)
 
         queryset = view.form_empty()
-        self.assertEqual(queryset.query.order_by, [])
+        self.assertEqual(list(queryset.query.order_by), [])
 
     def test_default_filter(self):
         """Test the default filter"""
@@ -187,7 +178,7 @@ def test_default_order_form_valid(self):
 
         view.form.is_valid()
         queryset = view.form_valid(view.form)
-        self.assertEqual(queryset.query.order_by, ['last_name'])
+        self.assertEqual(list(queryset.query.order_by), ['last_name'])
 
     def test_default_order_form_invalid(self):
         """Queryset is ordered by default_order when no order_by in request
@@ -202,7 +193,7 @@ def test_default_order_form_invalid(self):
 
         view.form.is_valid()
         queryset = view.form_invalid(view.form)
-        self.assertEqual(queryset.query.order_by, ['last_name'])
+        self.assertEqual(list(queryset.query.order_by), ['last_name'])
 
     def test_default_order_form_empty(self):
         """Queryset is ordered by default_order when no order_by in request."""
@@ -215,7 +206,7 @@ def test_default_order_form_empty(self):
             request)
 
         queryset = view.form_empty()
-        self.assertEqual(queryset.query.order_by, ['last_name'])
+        self.assertEqual(list(queryset.query.order_by), ['last_name'])
 
     def test_default_order_reverse(self):
         """To test order reverse"""
@@ -229,7 +220,7 @@ def test_default_order_reverse(self):
 
         view.form.is_valid()
         queryset = view.form_valid(view.form)
-        self.assertEqual(queryset.query.order_by, ['-last_name'])
+        self.assertEqual(list(queryset.query.order_by), ['-last_name'])
 
     def test_default_order_in_request(self):
         """Test with order_by in data."""
@@ -243,7 +234,7 @@ def test_default_order_in_request(self):
 
         view.form.is_valid()
         queryset = view.form_valid(view.form)
-        self.assertEqual(queryset.query.order_by, ['last_name'])
+        self.assertEqual(list(queryset.query.order_by), ['last_name'])
 
     def test_filtered_list_view(self):
         a = views.FilteredListView(filter_fields=['city'],
@@ -291,7 +282,7 @@ def test_filtered_list_view__none(self):
                                       form_class=self.Form,
                                       model=self.QueryModel)
 
-        data = {"city": None, "people": "S"}
+        data = {"city": "None", "people": "S"}
         setup_view(view, RequestFactory().get('/fake', data))
         view.form.is_valid()
         self.assertIn(
@@ -306,7 +297,7 @@ def test_filtered_list_view__none(self):
                                       form_class=self.Form,
                                       model=self.QueryModel)
 
-        data = {"city": "N", "people": None}
+        data = {"city": "N", "people": "None"}
         setup_view(view, RequestFactory().get('/fake', data))
         view.form.is_valid()
         self.assertIn(
@@ -431,7 +422,7 @@ def test_filtered_list_view__modelchoice__none(self):
                                       form_class=self.Form,
                                       model=self.QueryModel)
 
-        data = {"city": "N", "parent": None}
+        data = {"city": "N", "parent": "None"}
         setup_view(view, RequestFactory().get('/fake', data))
         view.form.is_valid()
         self.assertIn(
diff --git a/django_genericfilters/views.py b/django_genericfilters/views.py
diff --git a/docs/conf.py b/docs/conf.py
diff --git a/setup.cfg b/setup.cfg
diff --git a/setup.py b/setup.py
diff --git a/tox.ini b/tox.ini

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`
`3`	`2`	`from django_genericfilters.views import FilteredListView`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,9 @@`
`20`	`20`	`DATABASES = {`
`21`	`21`	`"default": {`
`22`	`22`	`"ENGINE": "django.db.backends.postgresql_psycopg2",`
`23`		`- "NAME": "test",`
`24`		`- "USER": environ.get("DJANGO_DB_USER", environ.get("USER")),`
`25`		`- 'PASSWORD': environ.get("DJANGO_DB_PASSWORD", ""),`
`26`		`- 'HOST': '',`
`27`		`- 'PORT': '',`
	`23`	`+ "NAME": environ.get("PGDATABASE", "django_generic_filters")`
	`24`	`+ # Configure database using standard PG* environment variables`
	`25`	`+ # https://www.postgresql.org/docs/current/libpq-envars.html`
`28`	`26`	`}`
`29`	`27`	`}`
`30`	`28`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`from django import forms`
`3`	`2`	`from django.utils.translation import ugettext_lazy as _`
`4`	`3`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-{% load i18n updateurl utils staticfiles %}`
	`1`	`+{% load i18n updateurl utils static %}`
`2`	`2`	`<link rel="stylesheet" href="{% static 'css/filters_list.css' %}" />`
`3`	`3`	`<form method="GET" id="search_form" style="display: block;">`
`4`	`4`	`<ul class="nav nav-list">`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,3 @@`
`1`		`-# -- coding: utf-8 --`
`2`	`1`	`import unittest`
`3`	`2`
`4`	`3`	`from django import forms`