[WIP] Add Support for Django 1.11 and add Python 3 support.

.gitignore

@@ -6,3 +6,4 @@ build
 dist
 *.egg-info
 *.orig
+.*.swp

.travis.yml

@@ -0,0 +1,8 @@
+language: python
+python:
+  - "2.7"
+  - "3.6"
+# command to install dependencies
+install: "pip install -r testproject/requirements.txt"
+# command to run tests
+script: make test

AUTHORS

@@ -7,4 +7,10 @@ Contributors:
 * Silvano Buback
 * Gustavo Soares Souza
 * Marcus Bergo
+* Brian Dailey
+* Matt George
+* Will Golden
+* Scott Burns
+* Chris Graffagnino
+* Anthony Fox
 * Mauro Murari

README.rst

@@ -1,3 +1,5 @@
+.. image:: https://drone.io/github.com/stratasan/django-simple-audit/status.png
+
 ****************************************
 django simple audit
 ****************************************
@@ -73,7 +75,7 @@ to audit a model you need import `simple_audit` and then register the model to b
 	        return self.name
 
 
-	simple_audit.register(Message, Owner, VirtualMachine)
+	simple_audit.signal.register(Message, Owner, VirtualMachine)
 
 Advanced Usage (without httprequest or our middleware)
 --------------------------------------------------------
@@ -110,8 +112,9 @@ You need to have at least one cache backend set in your django settings, otherwi
 Dependencies
 ============
 
-* Django >= 1.4.x
+* Django >= 1.8.x
 * django.contrib.contenttypes installed in INSTALLED_APPS
+* Supports Python >= 2.7 and Python3 >= 3.6
 
 
 TODO
@@ -120,6 +123,13 @@ TODO
 
 CHANGELOG
 =========
+* 0.4
+    * Update with compatibility for Django 1.11 and Python 3
+* 0.3
+    * Update with compatibility for Django 1.10
+* 0.2
+    * Update with compatibility for Django 1.9
+    * Add Migrations
 * 0.1.22
 	* Fixing admin display Current Content when audited model was deleted ( thanks otherpirate )
 * 0.1.21

setup.py

@@ -5,7 +5,7 @@
 STATUS_BETA = 'Development Status :: 4 - Beta'
 STATUS_ALPHA = 'Development Status :: 3 - Alpha'
 
-version = '0.1.22'
+version = '0.2.1'
 README = os.path.join(os.path.dirname(__file__), 'README.rst')
 long_description = open(README).read()
 setup(
@@ -21,6 +21,8 @@
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
+        'Programming Language :: Python :: 2',
+        'Programming Language :: Python :: 3',
         'Topic :: Software Development :: Libraries :: Python Modules',
         'Topic :: Utilities'],
     keywords='revisions versioning history audit',

simple_audit/__init__.py

@@ -1 +0,0 @@
-from .signal import register

simple_audit/admin.py

@@ -5,6 +5,8 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils.html import escape
 from django.core.urlresolvers import reverse
+from django.shortcuts import redirect
+from django.conf.urls import url
 from .models import Audit
 from .signal import MODEL_LIST
 
@@ -42,6 +44,28 @@ class AuditAdmin(admin.ModelAdmin):
     list_display = ("format_date", "audit_content", "operation", "audit_user", "audit_description", )
     list_filter = ("operation", ContentTypeListFilter,)
 
+    def get_urls(self):
+        urls = super(AuditAdmin, self).get_urls()
+        my_urls = [
+            url(r'^revert/(?P<audit_id>\d+)/$', self.admin_site.admin_view(self.revert_change), name='simple_audit_audit_revert')
+        ]
+        return my_urls + urls
+
+    def revert_change(self, request, audit_id):
+        audit = Audit.objects.get(pk=audit_id)
+        if audit.operation == Audit.CHANGE:
+            audit_obj = audit.content_object
+            for change in audit.field_changes.all():
+                setattr(audit_obj, change.field, change.old_value)
+            audit_obj.save(force_insert=False)
+        elif audit.operation == Audit.DELETE:
+            audit_obj = audit.content_type.model_class()(pk=audit.object_id)
+            for change in audit.field_changes.all():
+                setattr(audit_obj, change.field, change.new_value)
+            audit_obj.save(force_insert=True)
+
+        return redirect('admin:simple_audit_audit_changelist')
+
     def format_date(self, obj):
         return obj.date.strftime('%d/%m/%Y %H:%M')
     format_date.short_description = _("Date")

simple_audit/m2m_audit.py

@@ -12,8 +12,14 @@ def ValuesQuerySetToDict(vqs):
 
 
 def get_m2m_fields_for(instance=None):
-    """gets m2mfields for instance"""
-    return instance._meta._many_to_many()
+    """gets m2mfields for instance
+
+    instance._meta._many_to_many was deprecated, this follows
+    https://docs.djangoproject.com/en/1.9/ref/models/meta/#migrating-from-the-old-api
+    for migrating to the new API. This is similar to get_m2m_with_model
+    except only includes field in the list and not their models. """
+    return [f for f in instance._meta.get_fields()
+        if f.many_to_many and not f.auto_created]
 
 
 def get_m2m_values_for(instance=None):
@@ -83,18 +89,15 @@ def m2m_clean_unchanged_fields(dict_diff):
     returns a list of dicts with only the changes
     """
     dict_list = []
-    for key in dict_diff.keys():
+    for key in list(dict_diff.keys()):
         new_dict = {}
         dict_ = dict_diff.get(key)
 
-        for value in dict_.keys():
+        for value in list(dict_.keys()):
             compound_key = "%s.%s" % (key, value)
-            if dict_[value][0] == dict_[value][1]:
-                del dict_[value]
-            else:
+            if not dict_[value][0] == dict_[value][1]:
                 new_dict[compound_key] = dict_[value]
 
-        del dict_diff[key]
         if new_dict:
             dict_list.append(new_dict)
 

simple_audit/migrations/0001_initial.py

@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+from django.conf import settings
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contenttypes', '0002_remove_content_type_name'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Audit',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('date', models.DateTimeField(auto_now_add=True, verbose_name='Date')),
+                ('operation', models.PositiveIntegerField(max_length=255, verbose_name='Operation', choices=[(0, 'add'), (1, 'change'), (2, 'delete')])),
+                ('object_id', models.PositiveIntegerField()),
+                ('description', models.TextField()),
+                ('obj_description', models.CharField(db_index=True, max_length=100, null=True, blank=True)),
+            ],
+            options={
+                'db_table': 'audit',
+                'verbose_name': 'Audit',
+                'verbose_name_plural': 'Audits',
+            },
+        ),
+        migrations.CreateModel(
+            name='AuditChange',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('field', models.CharField(max_length=255)),
+                ('old_value', models.TextField(null=True, blank=True)),
+                ('new_value', models.TextField(null=True, blank=True)),
+                ('audit', models.ForeignKey(related_name='field_changes', to='simple_audit.Audit')),
+            ],
+            options={
+                'db_table': 'audit_change',
+                'verbose_name': 'Audit',
+                'verbose_name_plural': 'Audits',
+            },
+        ),
+        migrations.CreateModel(
+            name='AuditRequest',
+            fields=[
+                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
+                ('request_id', models.CharField(max_length=255)),
+                ('ip', models.IPAddressField()),
+                ('path', models.CharField(max_length=1024)),
+                ('date', models.DateTimeField(auto_now_add=True, verbose_name='Date')),
+                ('user', models.ForeignKey(to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'db_table': 'audit_request',
+                'verbose_name': 'Audit',
+                'verbose_name_plural': 'Audits',
+            },
+        ),
+        migrations.AddField(
+            model_name='audit',
+            name='audit_request',
+            field=models.ForeignKey(to='simple_audit.AuditRequest', null=True),
+        ),
+        migrations.AddField(
+            model_name='audit',
+            name='content_type',
+            field=models.ForeignKey(to='contenttypes.ContentType'),
+        ),
+    ]

simple_audit/migrations/0002_auto_fix_field_warnings.py

@@ -0,0 +1,24 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('simple_audit', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='audit',
+            name='operation',
+            field=models.PositiveIntegerField(verbose_name='Operation', choices=[(0, 'add'), (1, 'change'), (2, 'delete')]),
+        ),
+        migrations.AlterField(
+            model_name='auditrequest',
+            name='ip',
+            field=models.GenericIPAddressField(),
+        ),
+    ]

simple_audit/models.py

@@ -8,9 +8,9 @@
 from django.db import models
 from .managers import AuditManager
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.utils.translation import ugettext_lazy as _
-
+from django.utils.encoding import python_2_unicode_compatible
 
 LOG = logging.getLogger(__name__)
 
@@ -28,6 +28,7 @@ def title(self):
     __deepcopy__ = lambda self, memodict: self
 
 
+@python_2_unicode_compatible
 class Audit(models.Model):
     ADD = 0
     CHANGE = 1
@@ -38,10 +39,10 @@ class Audit(models.Model):
         (DELETE, _('delete'))
     )
     date = models.DateTimeField(auto_now_add=True, verbose_name=_("Date"))
-    operation = models.PositiveIntegerField(max_length=255, choices=OPERATION_CHOICES, verbose_name=_('Operation'))
+    operation = models.PositiveIntegerField(choices=OPERATION_CHOICES, verbose_name=_('Operation'))
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField(db_index=True)
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')
     audit_request = models.ForeignKey("AuditRequest", null=True)
     description = models.TextField()
     obj_description = models.CharField(max_length=100, db_index=True, null=True, blank=True)
@@ -64,13 +65,13 @@ def register(audit_obj, description, operation=None):
         audit.operation = Audit.CHANGE if operation is None else operation
         audit.content_object = audit_obj
         audit.description = description
-        audit.obj_description = (audit_obj and unicode(audit_obj) and '')[:100]
+        audit.obj_description = (audit_obj and str(audit_obj) and '')[:100]
         audit.audit_request = AuditRequest.current_request(True)
         audit.save()
         return audit
 
-    def __unicode__(self):
-        return u"%s" % (self.operation)
+    def __str__(self):
+        return "%s" % (self.operation)
 
 
 class AuditChange(models.Model):
@@ -91,7 +92,7 @@ class AuditRequest(models.Model):
     THREAD_LOCAL = threading.local()
 
     request_id = models.CharField(max_length=255)
-    ip = models.IPAddressField()
+    ip = models.GenericIPAddressField()
     path = models.CharField(max_length=1024)
     date = models.DateTimeField(auto_now_add=True, verbose_name=_("Date"))
     user = models.ForeignKey(getattr(settings, 'AUTH_USER_MODEL', 'auth.User'))