Hello community,
here is the log from the commit of package python-django-reversion for
openSUSE:Factory checked in at 2019-05-05 21:22:11
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-django-reversion (Old)
and /work/SRC/openSUSE:Factory/.python-django-reversion.new.5148 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-django-reversion"
Sun May 5 21:22:11 2019 rev:9 rq:700613 version:3.0.3
Changes:
--------
---
/work/SRC/openSUSE:Factory/python-django-reversion/python-django-reversion.changes
2019-04-30 13:01:19.814157133 +0200
+++
/work/SRC/openSUSE:Factory/.python-django-reversion.new.5148/python-django-reversion.changes
2019-05-05 21:22:12.581406368 +0200
@@ -1,0 +2,6 @@
+Sat May 4 15:55:42 UTC 2019 - Martin Herkt <[email protected]>
+
+- Add 0000-Remove-django.contrib.admin-dependency.patch
+ https://github.com/etianen/django-reversion/issues/744
+
+-------------------------------------------------------------------
New:
----
0000-Remove-django.contrib.admin-dependency.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-django-reversion.spec ++++++
--- /var/tmp/diff_new_pack.Q7rE1I/_old 2019-05-05 21:22:13.025407577 +0200
+++ /var/tmp/diff_new_pack.Q7rE1I/_new 2019-05-05 21:22:13.025407577 +0200
@@ -25,6 +25,8 @@
Group: Development/Languages/Python
URL: http://github.com/etianen/django-reversion
Source:
https://files.pythonhosted.org/packages/source/d/django-reversion/django-reversion-%{version}.tar.gz
+# PATCH-FIX-UPSTREAM - 0000-Remove-django.contrib.admin-dependency.patch --
https://github.com/etianen/django-reversion/issues/744
+Patch0: 0000-Remove-django.contrib.admin-dependency.patch
BuildRequires: %{python_module setuptools}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -44,6 +46,7 @@
%prep
%setup -q -n django-reversion-%{version}
+%autopatch -p1
%build
%python_build
++++++ 0000-Remove-django.contrib.admin-dependency.patch ++++++
>From be5b03e937eef547f80be1cf84a125df1655f53b Mon Sep 17 00:00:00 2001
From: Aitor Ruano <[email protected]>
Date: Tue, 2 Apr 2019 13:08:28 +0200
Subject: [PATCH] Remove django.contrib.admin dependency from django-reversion
---
reversion/models.py | 25 +++++++++++++++++--------
1 file changed, 17 insertions(+), 8 deletions(-)
diff --git a/reversion/models.py b/reversion/models.py
index de91e3cc..93c3a9f7 100644
--- a/reversion/models.py
+++ b/reversion/models.py
@@ -1,21 +1,26 @@
from __future__ import unicode_literals
+
from collections import defaultdict
from itertools import chain, groupby
+
+from django.apps import apps
+from django.conf import settings
from django.contrib.contenttypes.fields import GenericForeignKey
from django.contrib.contenttypes.models import ContentType
-from django.conf import settings
-from django.contrib.admin.models import LogEntry
from django.core import serializers
-from django.core.serializers.base import DeserializationError
from django.core.exceptions import ObjectDoesNotExist
-from django.db import models, IntegrityError, transaction, router, connections
+from django.core.serializers.base import DeserializationError
+from django.db import IntegrityError, connections, models, router, transaction
from django.db.models.deletion import Collector
from django.db.models.expressions import RawSQL
-from django.utils.functional import cached_property
-from django.utils.translation import ugettext_lazy as _, ugettext
from django.utils.encoding import force_text, python_2_unicode_compatible
+from django.utils.functional import cached_property
+from django.utils.translation import ugettext
+from django.utils.translation import ugettext_lazy as _
+
from reversion.errors import RevertError
-from reversion.revisions import _get_options, _get_content_type,
_follow_relations_recursive
+from reversion.revisions import (_follow_relations_recursive,
+ _get_content_type, _get_options)
def _safe_revert(versions):
@@ -61,7 +66,11 @@ class Revision(models.Model):
)
def get_comment(self):
- return LogEntry(change_message=self.comment).get_change_message()
+ try:
+ LogEntry = apps.get_model('admin.LogEntry')
+ return LogEntry(change_message=self.comment).get_change_message()
+ except LookupError:
+ return self.comment
def revert(self, delete=False):
# Group the models by the database of the serialized model.
