[Python-modules-commits] [django-model-utils] 03/07: Fix FieldTracker failing with Django 1.10

[Brian May]

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

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

commit 777393fbb8b0684d2a5fe1095c4ff98965eb1238
Author: Brian May <bam at debian.org>
Date:   Sun Sep 11 12:21:37 2016 +1000

    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):

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