CVS commit: pkgsrc/www/py-django-filter

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Sun Oct 11 23:48:18 UTC 2020

Modified Files:
        pkgsrc/www/py-django-filter: Makefile distinfo
Added Files:
        pkgsrc/www/py-django-filter/patches: patch-django__filters_utils.py

Log Message:
Fix support for newer Django versions. Bump revision.


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/www/py-django-filter/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/py-django-filter/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/py-django-filter/patches/patch-django__filters_utils.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/py-django-filter/Makefile
diff -u pkgsrc/www/py-django-filter/Makefile:1.7 pkgsrc/www/py-django-filter/Makefile:1.8
--- pkgsrc/www/py-django-filter/Makefile:1.7    Wed Dec 18 15:43:44 2019
+++ pkgsrc/www/py-django-filter/Makefile        Sun Oct 11 23:48:18 2020
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2019/12/18 15:43:44 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2020/10/11 23:48:18 joerg Exp $
 
 DISTNAME=      django-filter-2.2.0
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION=   1
 CATEGORIES=    www python
 MASTER_SITES=  ${MASTER_SITE_PYPI:=d/django-filter/}
 

Index: pkgsrc/www/py-django-filter/distinfo
diff -u pkgsrc/www/py-django-filter/distinfo:1.5 pkgsrc/www/py-django-filter/distinfo:1.6
--- pkgsrc/www/py-django-filter/distinfo:1.5    Sun Dec 15 21:41:26 2019
+++ pkgsrc/www/py-django-filter/distinfo        Sun Oct 11 23:48:18 2020
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2019/12/15 21:41:26 adam Exp $
+$NetBSD: distinfo,v 1.6 2020/10/11 23:48:18 joerg Exp $
 
 SHA1 (django-filter-2.2.0.tar.gz) = 9796ad961fcf319c637e8a36a137b1f944a67e47
 RMD160 (django-filter-2.2.0.tar.gz) = d2205313ca6393a87e2b37c53c01b48dade966cc
 SHA512 (django-filter-2.2.0.tar.gz) = 16a4336d1558cabfe497dd9736a2f652c9f9d141a72c856cf13f3ca56db4da85b5926b05c772aef5fa43a75e085025244b8deaf7facbc5bfa68907bd99f4f95d
 Size (django-filter-2.2.0.tar.gz) = 142804 bytes
+SHA1 (patch-django__filters_utils.py) = ee77665c2533ea7ac47b3e7e0d06054286722c99

Added files:

Index: pkgsrc/www/py-django-filter/patches/patch-django__filters_utils.py
diff -u /dev/null pkgsrc/www/py-django-filter/patches/patch-django__filters_utils.py:1.1
--- /dev/null   Sun Oct 11 23:48:18 2020
+++ pkgsrc/www/py-django-filter/patches/patch-django__filters_utils.py  Sun Oct 11 23:48:18 2020
@@ -0,0 +1,19 @@
+$NetBSD: patch-django__filters_utils.py,v 1.1 2020/10/11 23:48:18 joerg Exp $
+
+Support newer Django versions.
+
+--- django_filters/utils.py.orig       2020-10-11 20:39:52.623467617 +0000
++++ django_filters/utils.py
+@@ -3,11 +3,10 @@ from collections import OrderedDict
+ 
+ import django
+ from django.conf import settings
+-from django.core.exceptions import FieldError
++from django.core.exceptions import FieldError, FieldDoesNotExist
+ from django.db import models
+ from django.db.models.constants import LOOKUP_SEP
+ from django.db.models.expressions import Expression
+-from django.db.models.fields import FieldDoesNotExist
+ from django.db.models.fields.related import ForeignObjectRel, RelatedField
+ from django.utils import timezone
+ from django.utils.encoding import force_str