Hopiu/django-model-utils
1
0
Fork 0
mirror of https://github.com/Hopiu/django-model-utils.git synced 2026-03-16 20:00:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix iterator/list problems for Python 3 support

Browse source
This commit is contained in:
Trey Hunner 2013-04-06 15:55:22 -07:00
parent 0147a31f27
commit 81c7e40e60
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
model_utils/managers.py
View file

@ -38,7 +38,7 @@ class InheritanceQuerySet(QuerySet):
def annotate(self, *args, **kwargs):
qset = super(InheritanceQuerySet, self).annotate(*args, **kwargs)
qset._annotated = [a.default_alias for a in args] + kwargs.keys()
qset._annotated = [a.default_alias for a in args] + list(kwargs.keys())
return qset

6
model_utils/tests/tests.py
View file

@ -654,7 +654,7 @@ class ModelTrackerTestCase(TestCase):
def assertHasChanged(self, **kwargs):
tracker = kwargs.pop('tracker', self.tracker)
for field, value in kwargs.iteritems():
for field, value in kwargs.items():
if value is None:
self.assertRaises(FieldError, tracker.has_changed, field)
else:
@ -662,7 +662,7 @@ class ModelTrackerTestCase(TestCase):
def assertPrevious(self, **kwargs):
tracker = kwargs.pop('tracker', self.tracker)
for field, value in kwargs.iteritems():
for field, value in kwargs.items():
self.assertEqual(tracker.previous(field), value)
def assertChanged(self, **kwargs):
@ -674,7 +674,7 @@ class ModelTrackerTestCase(TestCase):
self.assertEqual(tracker.current(), kwargs)
def update_instance(self, **kwargs):
for field, value in kwargs.iteritems():
for field, value in kwargs.items():
setattr(self.instance, field, value)
self.instance.save()

2
model_utils/tracker.py
View file

@ -74,6 +74,6 @@ class ModelInstanceTracker(object):
"""Returns dict of fields that changed since save (with old values)"""
if not self.instance.pk:
return {}
saved = self.saved_data.iteritems()
saved = self.saved_data.items()
current = self.current()
return dict((k, v) for k, v in saved if v != current[k])