[Python-modules-commits] r24693 - in packages/django-filter/trunk (13 files)
fladi-guest at users.alioth.debian.org
fladi-guest at users.alioth.debian.org
Fri Jun 7 09:51:08 UTC 2013
Date: Friday, June 7, 2013 @ 09:50:50
Author: fladi-guest
Revision: 24693
[svn-inject] Applying Debian modifications (0.5.3-3) to trunk
Added:
packages/django-filter/trunk/debian/
packages/django-filter/trunk/debian/changelog
packages/django-filter/trunk/debian/compat
packages/django-filter/trunk/debian/control
packages/django-filter/trunk/debian/copyright
packages/django-filter/trunk/debian/patches/
packages/django-filter/trunk/debian/patches/fix_import_error
packages/django-filter/trunk/debian/patches/series
packages/django-filter/trunk/debian/patches/xmlfield_optional
packages/django-filter/trunk/debian/pycompat
packages/django-filter/trunk/debian/rules
packages/django-filter/trunk/debian/source/
packages/django-filter/trunk/debian/source/format
Property changes on: packages/django-filter/trunk/debian
___________________________________________________________________
Added: mergeWithUpstream
+ 1
Added: packages/django-filter/trunk/debian/changelog
===================================================================
--- packages/django-filter/trunk/debian/changelog (rev 0)
+++ packages/django-filter/trunk/debian/changelog 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1,20 @@
+django-filter (0.5.3-3) unstable; urgency=low
+
+ * Clean out debian/patches/debian-changes-0.5.3-2 and fix FTBS.
+ Closes: #643092.
+ * Increase standards version to 3.9.2 from 3.9.1
+ * Add patch from upstream to make XMLField optional.
+
+ -- Brian May <bam at debian.org> Wed, 12 Oct 2011 09:50:46 +1100
+
+django-filter (0.5.3-2) unstable; urgency=low
+
+ * Remove redundant line from debian/rules.
+
+ -- Brian May <bam at debian.org> Fri, 08 Apr 2011 10:41:00 +1000
+
+django-filter (0.5.3-1) unstable; urgency=low
+
+ * Initial release. Closes: #619195.
+
+ -- Brian May <bam at debian.org> Mon, 28 Mar 2011 13:41:07 +1100
Added: packages/django-filter/trunk/debian/compat
===================================================================
--- packages/django-filter/trunk/debian/compat (rev 0)
+++ packages/django-filter/trunk/debian/compat 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1 @@
+7
Added: packages/django-filter/trunk/debian/control
===================================================================
--- packages/django-filter/trunk/debian/control (rev 0)
+++ packages/django-filter/trunk/debian/control 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1,14 @@
+Source: django-filter
+Section: python
+Priority: optional
+Maintainer: Brian May <bam at debian.org>
+Build-Depends: debhelper (>=7.0.0), python (>= 2.4), python-support (>= 0.6), cdbs (>= 0.4.49), python-setuptools
+Standards-Version: 3.9.2
+
+Package: django-filter
+Architecture: all
+Homepage: http://github.com/alex/django-filter
+Depends: ${misc:Depends}, ${python:Depends}, python-django
+Description: Django library for filtering Django QuerySets based on user selections
+ A reusable Django application for allowing programmers to filter queryset
+ dynamically.
Added: packages/django-filter/trunk/debian/copyright
===================================================================
--- packages/django-filter/trunk/debian/copyright (rev 0)
+++ packages/django-filter/trunk/debian/copyright 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1,37 @@
+This package was debianized by Brian May.
+
+It was downloaded from http://github.com/alex/django-filter
+
+Upstream Author:
+
+ Alex Gaynor
+
+Copyright:
+
+ Copyright (c) 2009, Alex Gaynor
+
+License:
+
+ All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * The names of its contributors may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Added: packages/django-filter/trunk/debian/patches/fix_import_error
===================================================================
--- packages/django-filter/trunk/debian/patches/fix_import_error (rev 0)
+++ packages/django-filter/trunk/debian/patches/fix_import_error 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1,54 @@
+commit ec3bc8c336e594c089265e90472cf0a5e69c583a
+Author: Tino de Bruijn <tinodb at gmail.com>
+Date: Fri Jun 4 22:47:33 2010 +0800
+
+ Fix for #37 Import Error with multiple lookup types with no GET params
+
+diff --git a/django_filters/filters.py b/django_filters/filters.py
+index 866b0e6..54f6107 100644
+--- a/django_filters/filters.py
++++ b/django_filters/filters.py
+@@ -51,6 +51,8 @@ class Filter(object):
+ return self._field
+
+ def filter(self, qs, value):
++ if not value:
++ return qs
+ if isinstance(value, (list, tuple)):
+ lookup = str(value[1])
+ if not lookup:
+diff --git a/django_filters/tests/__init__.py b/django_filters/tests/__init__.py
+index b6d2ebe..560d834 100644
+--- a/django_filters/tests/__init__.py
++++ b/django_filters/tests/__init__.py
+@@ -1,6 +1,7 @@
+ from tests import (GenericViewTests, InheritanceTest, ModelInheritanceTest,
+ DateRangeFilterTest, FilterSetForm, AllValuesFilterTest, InitialValueTest,
+- RelatedObjectTest, MultipleChoiceFilterTest, filter_tests)
++ RelatedObjectTest, MultipleChoiceFilterTest, MultipleLookupTypesTest,
++ filter_tests)
+
+ __test__ = {
+ 'filter_tests': filter_tests,
+diff --git a/django_filters/tests/tests.py b/django_filters/tests/tests.py
+index bafbadf..2e0b1af 100644
+--- a/django_filters/tests/tests.py
++++ b/django_filters/tests/tests.py
+@@ -144,6 +144,17 @@ class MultipleChoiceFilterTest(TestCase):
+
+ self.assertEqual(list(F({"status": [0, 1]}).qs), list(User.objects.all()))
+
++class MultipleLookupTypesTest(TestCase):
++ fixtures = ['test_data']
++
++ def test_no_GET_params(self):
++ class F(django_filters.FilterSet):
++ published = django_filters.DateTimeFilter(lookup_type=['gt', 'lt'])
++ class Meta:
++ model = Article
++ fields = ['published']
++
++ self.assertEqual(list(F({}).qs), list(Article.objects.all()))
+
+ filter_tests = """
+ >>> from datetime import datetime
Added: packages/django-filter/trunk/debian/patches/series
===================================================================
--- packages/django-filter/trunk/debian/patches/series (rev 0)
+++ packages/django-filter/trunk/debian/patches/series 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1,2 @@
+fix_import_error
+xmlfield_optional
Added: packages/django-filter/trunk/debian/patches/xmlfield_optional
===================================================================
--- packages/django-filter/trunk/debian/patches/xmlfield_optional (rev 0)
+++ packages/django-filter/trunk/debian/patches/xmlfield_optional 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1,31 @@
+commit 51b39fca089f2cb1d3d3501d2e164635fbe52864
+Author: Alex Gaynor <alex.gaynor at gmail.com>
+Date: Sat Apr 2 14:36:25 2011 -0400
+
+ Fixed #46 -- XMLField is no longer in Django 1.4
+
+diff --git a/django_filters/filterset.py b/django_filters/filterset.py
+index 9405538..a3436a5 100644
+--- a/django_filters/filterset.py
++++ b/django_filters/filterset.py
+@@ -184,9 +184,6 @@ FILTER_FOR_DBFIELD_DEFAULTS = {
+ models.URLField: {
+ 'filter_class': CharFilter,
+ },
+- models.XMLField: {
+- 'filter_class': CharFilter,
+- },
+ models.IPAddressField: {
+ 'filter_class': CharFilter,
+ },
+@@ -194,6 +191,10 @@ FILTER_FOR_DBFIELD_DEFAULTS = {
+ 'filter_class': CharFilter,
+ },
+ }
++if hasattr(models, "XMLField"):
++ FILTER_FOR_DBFIELD_DEFAULTS[models.XMLField] = {
++ 'filter_class': CharFilter,
++ }
+
+ class BaseFilterSet(object):
+ filter_overrides = {}
Added: packages/django-filter/trunk/debian/pycompat
===================================================================
--- packages/django-filter/trunk/debian/pycompat (rev 0)
+++ packages/django-filter/trunk/debian/pycompat 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1 @@
+2
Added: packages/django-filter/trunk/debian/rules
===================================================================
--- packages/django-filter/trunk/debian/rules (rev 0)
+++ packages/django-filter/trunk/debian/rules 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+
+DEB_PYTHON_SYSTEM := pysupport
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/python-distutils.mk
Property changes on: packages/django-filter/trunk/debian/rules
___________________________________________________________________
Added: svn:executable
+ *
Added: packages/django-filter/trunk/debian/source/format
===================================================================
--- packages/django-filter/trunk/debian/source/format (rev 0)
+++ packages/django-filter/trunk/debian/source/format 2013-06-07 09:50:50 UTC (rev 24693)
@@ -0,0 +1 @@
+3.0 (quilt)
More information about the Python-modules-commits
mailing list