[Python-modules-commits] [django-model-utils] 04/05: Apply updates for version 3.0.0-1

[Brian May]

This is an automated email from the git hooks/post-receive script.

bam pushed a commit to branch debian/master
in repository django-model-utils.

commit d2760238aa37bcb5205da965463474925d6ecd8e
Author: Brian May <bam at debian.org>
Date:   Mon Jul 3 08:21:33 2017 +1000

    Apply updates for version 3.0.0-1
---
 debian/changelog                                   |  6 ++
 ...Fix-FieldTracker-failing-with-Django-1.10.patch | 85 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 6 insertions(+), 86 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f47f53..57e154a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+django-model-utils (3.0.0-1) UNRELEASED; urgency=medium
+
+  * New upstream version. Closes: :#865559.
+
+ -- Brian May <bam at debian.org>  Mon, 03 Jul 2017 08:16:26 +1000
+
 django-model-utils (2.5.2-2) unstable; urgency=medium
 
   [ Ben Finney ]
diff --git a/debian/patches/0001-Fix-FieldTracker-failing-with-Django-1.10.patch b/debian/patches/0001-Fix-FieldTracker-failing-with-Django-1.10.patch
deleted file mode 100644
index 52cc7fb..0000000
--- a/debian/patches/0001-Fix-FieldTracker-failing-with-Django-1.10.patch
+++ /dev/null
@@ -1,85 +0,0 @@
-From 777393fbb8b0684d2a5fe1095c4ff98965eb1238 Mon Sep 17 00:00:00 2001
-From: Brian May <bam at debian.org>
-Date: Sun, 11 Sep 2016 12:21:37 +1000
-Subject: Fix FieldTracker failing with Django 1.10
-
-From upstream pull request
-https://github.com/carljm/django-model-utils/issues/232
----
- model_utils/tracker.py | 41 ++++++++++++++++++++++++++++-------------
- 1 file changed, 28 insertions(+), 13 deletions(-)
-
-diff --git a/model_utils/tracker.py b/model_utils/tracker.py
-index a9c7f70..6aa7d8a 100644
---- a/model_utils/tracker.py
-+++ b/model_utils/tracker.py
-@@ -2,8 +2,9 @@ from __future__ import unicode_literals
- 
- from copy import deepcopy
- 
--from django.db import models
-+import django
- from django.core.exceptions import FieldError
-+from django.db import models
- from django.db.models.query_utils import DeferredAttribute
- 
- 
-@@ -62,12 +63,14 @@ class FieldInstanceTracker(object):
-         )
- 
-     def init_deferred_fields(self):
--        self.instance._deferred_fields = []
-+        self.instance._deferred_fields = set()
-         if hasattr(self.instance, '_deferred') and not self.instance._deferred:
-             return
- 
-         class DeferredAttributeTracker(DeferredAttribute):
-             def __get__(field, instance, owner):
-+                if instance is None:
-+                    return field
-                 data = instance.__dict__
-                 if data.get(field.field_name, field) is field:
-                     instance._deferred_fields.remove(field.field_name)
-@@ -76,19 +79,31 @@ class FieldInstanceTracker(object):
-                     self.saved_data[field.field_name] = deepcopy(value)
-                 return data[field.field_name]
- 
--        for field in self.fields:
--            field_obj = self.instance.__class__.__dict__.get(field)
--            if isinstance(field_obj, DeferredAttribute):
--                self.instance._deferred_fields.append(field)
--
--                # Django 1.4
--                model = None
--                if hasattr(field_obj, 'model_ref'):
--                    model = field_obj.model_ref()
--
-+        if django.VERSION >= (1, 8):
-+            self.instance._deferred_fields = self.instance.get_deferred_fields()
-+            for field in self.instance._deferred_fields:
-+                if django.VERSION >= (1, 10):
-+                    field_obj = getattr(self.instance.__class__, field)
-+                else:
-+                    field_obj = self.instance.__class__.__dict__.get(field)
-                 field_tracker = DeferredAttributeTracker(
--                    field_obj.field_name, model)
-+                    field_obj.field_name, None)
-                 setattr(self.instance.__class__, field, field_tracker)
-+        else:
-+            for field in self.fields:
-+                field_obj = self.instance.__class__.__dict__.get(field)
-+                if isinstance(field_obj, DeferredAttribute):
-+                    self.instance._deferred_fields.add(field)
-+
-+                    # Django 1.4
-+                    if django.VERSION >= (1, 5):
-+                        model = None
-+                    else:
-+                        model = field_obj.model_ref()
-+
-+                    field_tracker = DeferredAttributeTracker(
-+                        field_obj.field_name, model)
-+                    setattr(self.instance.__class__, field, field_tracker)
- 
- 
- class FieldTracker(object):
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 8f175f2..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-0001-Fix-FieldTracker-failing-with-Django-1.10.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/django-model-utils.git