Merge pull request #577 from carltongibson/develop

Version 1.0.2

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.0.1
+current_version = 1.0.2
 commit = False
 tag = False
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)(\-(?P<release>[a-z]+))?

.gitignore

@@ -5,3 +5,4 @@ dist/
 docs/_build
 .python-version
 .tox
+.coverage

.travis.yml

@@ -1,16 +1,24 @@
 sudo: false
 
 language: python
-python: '3.5'
+python:
+  - "2.7"
+  - "3.3"
+  - "3.4"
+  - "3.5"
+  - "3.6"
+
 cache: pip
 
 install:
-  - pip install coverage tox
+  - pip install coverage detox tox-travis
 
 script:
   - coverage erase
-  - tox
+  - detox
 
 after_success:
-  - coverage combine
-  - coverage report
+  - coverage combine --append
+  - coverage report -m
+  - pip install codecov
+  - codecov

MANIFEST.in

@@ -8,4 +8,7 @@ recursive-include docs *
 recursive-include requirements *
 recursive-include tests *
 recursive-include django_filters/locale *
-prune docs/_build
+recursive-include django_filters/templates *.html
+prune docs/_build
+global-exclude __pycache__
+global-exclude *.py[co]

README.rst

@@ -8,13 +8,20 @@ Full documentation on `read the docs`_.
 
 .. image:: https://travis-ci.org/carltongibson/django-filter.svg?branch=master
     :target: https://travis-ci.org/carltongibson/django-filter
+
+.. image:: https://codecov.io/gh/carltongibson/django-filter/branch/develop/graph/badge.svg
+    :target: https://codecov.io/gh/carltongibson/django-filter    
+
+.. image:: https://badge.fury.io/py/django-filter.svg
+    :target: http://badge.fury.io/py/django-filter
+
 
 Requirements
 ------------
 
 * **Python**: 2.7, 3.3, 3.4, 3.5
 * **Django**: 1.8, 1.9, 1.10
-* **DRF**: 3.4, 3.5
+* **DRF**: 3.5
 
 Installation
 ------------

codecov.yml

@@ -0,0 +1,5 @@
+coverage:
+  status:
+    project: false
+    patch: false
+    changes: false

django_filters/__init__.py

@@ -11,7 +11,7 @@
 except ImportError:
     rest_framework = None
 
-__version__ = '1.0.1'
+__version__ = '1.0.2'
 
 
 def parse_version(version):

django_filters/compat.py

@@ -3,15 +3,17 @@
 
 import django
 from django.conf import settings
-
+from django.utils.timezone import make_aware as make_aware_orig
 
 # django-crispy-forms is optional
 try:
     import crispy_forms
 except ImportError:
     crispy_forms = None
 
-is_crispy = 'crispy_forms' in settings.INSTALLED_APPS and crispy_forms
+
+def is_crispy():
+    return 'crispy_forms' in settings.INSTALLED_APPS and crispy_forms
 
 
 # coreapi is optional (Note that uritemplate is a dependency of coreapi)
@@ -49,3 +51,12 @@ def format_value(widget, value):
     if django.VERSION >= (1, 10):
         return widget.format_value(value)
     return widget._format_value(value)
+
+
+
+def make_aware(value, timezone, is_dst):
+    """is_dst was added for 1.9"""
+    if django.VERSION >= (1, 9):
+        return make_aware_orig(value, timezone, is_dst)
+    else:
+        return make_aware_orig(value, timezone)

django_filters/conf.py

@@ -1,4 +1,6 @@
 
+from __future__ import absolute_import
+
 from django.conf import settings as dj_settings
 from django.core.signals import setting_changed
 from django.utils.translation import ugettext_lazy as _
@@ -63,32 +65,30 @@
 
 DEPRECATED_SETTINGS = [
     'HELP_TEXT_FILTER',
-    'HELP_TEXT_EXCLUDE'
+    'HELP_TEXT_EXCLUDE',
 ]
 
 
+def is_callable(value):
+    # check for callables, except types
+    return callable(value) and not isinstance(value, type)
+
+
 class Settings(object):
 
-    def __init__(self):
-        for setting in DEFAULTS:
-            value = self.get_setting(setting)
-            setattr(self, setting, value)
+    def __getattr__(self, name):
+        if name not in DEFAULTS:
+            msg = "'%s' object has no attribute '%s'"
+            raise AttributeError(msg % (self.__class__.__name__, name))
 
-    def VERBOSE_LOOKUPS():
-        """
-        VERBOSE_LOOKUPS accepts a dictionary of {terms: verbose expressions}
-        or a zero-argument callable that returns a dictionary.
-        """
-        def fget(self):
-            if callable(self._VERBOSE_LOOKUPS):
-                self._VERBOSE_LOOKUPS = self._VERBOSE_LOOKUPS()
-            return self._VERBOSE_LOOKUPS
+        value = self.get_setting(name)
 
-        def fset(self, value):
-            self._VERBOSE_LOOKUPS = value
+        if is_callable(value):
+            value = value()
 
-        return locals()
-    VERBOSE_LOOKUPS = property(**VERBOSE_LOOKUPS())
+        # Cache the result
+        setattr(self, name, value)
+        return value
 
     def get_setting(self, setting):
         django_setting = 'FILTERS_%s' % setting
@@ -107,9 +107,11 @@ def change_setting(self, setting, value, enter, **kwargs):
         if setting not in DEFAULTS:
             return
 
-        # if exiting, refetch the value from settings.
-        value = value if enter else self.get_setting(setting)
-        setattr(self, setting, value)
+        # if exiting, delete value to repopulate
+        if enter:
+            setattr(self, setting, value)
+        else:
+            delattr(self, setting)
 
 
 settings = Settings()

django_filters/constants.py

@@ -2,14 +2,17 @@
 ALL_FIELDS = '__all__'
 
 
-class STRICTNESS:
-    class IGNORE:
+EMPTY_VALUES = ([], (), {}, '', None)
+
+
+class STRICTNESS(object):
+    class IGNORE(object):
         pass
 
-    class RETURN_NO_RESULTS:
+    class RETURN_NO_RESULTS(object):
         pass
 
-    class RAISE_VALIDATION_ERROR:
+    class RAISE_VALIDATION_ERROR(object):
         pass
 
     # Values of False & True chosen for backward compatability reasons.

django_filters/fields.py

@@ -43,10 +43,14 @@ def compress(self, data_list):
             start_date, stop_date = data_list
             if start_date:
                 start_date = handle_timezone(
-                    datetime.combine(start_date, time.min))
+                    datetime.combine(start_date, time.min),
+                    False
+                )
             if stop_date:
                 stop_date = handle_timezone(
-                    datetime.combine(stop_date, time.max))
+                    datetime.combine(stop_date, time.max),
+                    False
+                )
             return slice(start_date, stop_date)
         return None
 

django_filters/filters.py

@@ -14,6 +14,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from .conf import settings
+from .constants import EMPTY_VALUES
 from .fields import (
     Lookup, LookupTypeField, BaseCSVField, BaseRangeField, RangeField,
     DateRangeField, DateTimeRangeField, TimeRangeField, IsoDateTimeField
@@ -56,9 +57,6 @@
 LOOKUP_TYPES = sorted(QUERY_TERMS)
 
 
-EMPTY_VALUES = ([], (), {}, '', None)
-
-
 class Filter(object):
     creation_counter = 0
     field_class = forms.Field

django_filters/filterset.py

@@ -5,15 +5,14 @@
 from collections import OrderedDict
 
 from django import forms
-from django.forms.forms import NON_FIELD_ERRORS
 from django.db import models
 from django.db.models.constants import LOOKUP_SEP
 from django.db.models.fields.related import ForeignObjectRel
 from django.utils import six
 
 from .conf import settings
 from .compat import remote_field, remote_queryset
-from .constants import ALL_FIELDS, STRICTNESS
+from .constants import ALL_FIELDS, STRICTNESS, EMPTY_VALUES
 from .filters import (Filter, CharFilter, BooleanFilter, BaseInFilter, BaseRangeFilter,
                       ChoiceFilter, DateFilter, DateTimeFilter, TimeFilter, ModelChoiceFilter,
                       ModelMultipleChoiceFilter, NumberFilter, UUIDFilter, DurationFilter)
@@ -36,28 +35,30 @@ def get_filter_name(field_name, lookup_expr):
     return filter_name
 
 
-def get_full_clean_override(together):
-    def full_clean(form):
+def _together_valid(form, fieldset):
+    field_presence = [
+        form.cleaned_data.get(field) not in EMPTY_VALUES
+        for field in fieldset
+    ]
 
-        def add_error(message):
-            try:
-                form.add_error(None, message)
-            except AttributeError:
-                form._errors[NON_FIELD_ERRORS] = message
+    if any(field_presence):
+        return all(field_presence)
+    return True
 
-        def all_valid(fieldset):
-            cleaned_data = form.cleaned_data
-            count = len([i for i in fieldset if cleaned_data.get(i)])
-            return 0 < count < len(fieldset)
 
+def get_full_clean_override(together):
+    # coerce together to list of pairs
+    if isinstance(together[0], (six.string_types)):
+        together = [together]
+
+    def full_clean(form):
         super(form.__class__, form).full_clean()
         message = 'Following fields must be together: %s'
-        if isinstance(together[0], (list, tuple)):
-            for each in together:
-                if all_valid(each):
-                    return add_error(message % ','.join(each))
-        elif all_valid(together):
-            return add_error(message % ','.join(together))
+
+        for each in together:
+            if not _together_valid(form, each):
+                return form.add_error(None, message % ','.join(each))
+
     return full_clean
 
 
@@ -104,7 +105,11 @@ def get_declared_filters(cls, bases, attrs):
         # merge declared filters from base classes
         for base in reversed(bases):
             if hasattr(base, 'declared_filters'):
-                filters = list(base.declared_filters.items()) + filters
+                filters = [
+                    (name, f) for name, f
+                    in base.declared_filters.items()
+                    if name not in attrs
+                ] + filters
 
         return OrderedDict(filters)
 
@@ -421,8 +426,8 @@ class FilterSet(six.with_metaclass(FilterSetMetaclass, BaseFilterSet)):
     pass
 
 
-def filterset_factory(model):
-    meta = type(str('Meta'), (object,), {'model': model, 'fields': ALL_FIELDS})
+def filterset_factory(model, fields=ALL_FIELDS):
+    meta = type(str('Meta'), (object,), {'model': model, 'fields': fields})
     filterset = type(str('%sFilterSet' % model._meta.object_name),
                      (FilterSet,), {'Meta': meta})
     return filterset