drop python2 support, upgrade to django 3

pandora/changelog/models.py

@@ -1,11 +1,9 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
 
 from datetime import datetime
 
 from django.contrib.auth import get_user_model
 from django.db import models
-from django.utils.encoding import python_2_unicode_compatible
 from oxdjango.fields import JSONField
 
 import ox
@@ -19,14 +17,13 @@ User = get_user_model()
 '''
 FIXME: remove this table more migrate to new ChangeLog
 '''
-@python_2_unicode_compatible
 class Changelog(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     type = models.CharField(max_length=255, db_index=True)
     value = JSONField(default=dict, editable=False)
 
     def __str__(self):
-        return u'%s %s' % (self.type, self.created)
+        return '%s %s' % (self.type, self.created)
 
     def json(self):
         return self.value
@@ -50,19 +47,18 @@ def add_changelog(request, data, id=None):
         'user': c.user.username,
     })
 
-@python_2_unicode_compatible
 class Log(models.Model):
 
     action = models.CharField(max_length=255, db_index=True)
     data = JSONField(default=dict, editable=False)
     created = models.DateTimeField(db_index=True)
-    user = models.ForeignKey(User, null=True, related_name='changelog')
+    user = models.ForeignKey(User, null=True, related_name='changelog', on_delete=models.CASCADE)
     changeid = models.TextField()
 
     objects = managers.LogManager()
 
     def __str__(self):
-        return u'%s %s %s' % (self.created, self.action, self.changeid)
+        return '%s %s %s' % (self.created, self.action, self.changeid)
 
     def get_id(self):
         return ox.toAZ(self.id)

pandora/changelog/recover.py

@@ -1,4 +1,3 @@
-from __future__ import print_function
 
 import models
 import item.models
@@ -18,33 +17,33 @@ def recover_item(id):
     created = old.value['created']
     i.user = user.models.User.objects.get(username=i.data['user'])
     for key in [
-         u'rendered',
-         u'random',
-         u'cuts',
-         u'duration',
-         u'id',  
-         u'size',
-         u'posterFrame',
-         u'parts',
-         u'cutsperminute',
-         u'hue', 
-         u'numberofcuts',
-         u'durations',
-         u'volume',
-         u'user',
-         u'words',
-         u'videoRatio',
-         u'aspectratio',
-         u'bitrate',
-         u'pixels',
-         u'created',
-         u'numberoffiles',
-         u'modified',
-         u'timesaccessed',
-         u'accessed',
-         u'resolution',
-         u'wordsperminute',
-         u'posterRatio'
+        'rendered',
+        'random',
+        'cuts',
+        'duration',
+        'id',
+        'size',
+        'posterFrame',
+        'parts',
+        'cutsperminute',
+        'hue', 
+        'numberofcuts',
+        'durations',
+        'volume',
+        'user',
+        'words',
+        'videoRatio',
+        'aspectratio',
+        'bitrate',
+        'pixels',
+        'created',
+        'numberoffiles',
+        'modified',
+        'timesaccessed',
+        'accessed',
+        'resolution',
+        'wordsperminute',
+        'posterRatio'
     ]:
         if key in i.data:
             del i.data[key]

pandora/changelog/views.py

@@ -1,5 +1,4 @@
 # -*- coding: utf-8 -*-
-from __future__ import division, print_function, absolute_import
 
 import ox