Upgrade to Django 2.2

Author: oxoWrk

README.md

@@ -11,14 +11,14 @@ Open source feedback management system based on the Django framework. You can ea
 - Webpack/gulp compatible.
 
 ## Requirements
-- Django 1.11.*
-- Python 2.7
+- Django 2.2.*
+- Python 3.5
 
 ## Installation and basic usage
 
 1. Install package
 
-    `` pip install git+git://github.com/oldroute/django-simple-feedback.git@1.11``
+    `` pip install git+git://github.com/shoker174/django-simple-feedback.git``
 
 2. Create (or use) your own application for your feedback forms, for example ``custom_feedback``
 3. Configure your setting file:

feedback/admin.py

@@ -15,12 +15,6 @@ class FeedbackEmailAdmin(ModelAdmin):
 @admin.register(MailingList)
 class MailingListAdmin(ModelAdmin):
 
-    @property
-    def media(self):
-        media = super(MailingListAdmin, self).media
-        media.add_css(ADMIN_EXTRA_CSS)
-        return media
-
     form = MailingListAdminForm
     filter_horizontal = ['emails']
     fieldsets = (

feedback/forms.py

@@ -39,7 +39,7 @@ def __init__(self, *args, **kwargs):
 
     form = ChoiceField(
         label=_('form'), choices=make_form_choices(),
-        widget=forms.Select(attrs={'class':  get_extra_class('form')})
+        widget=forms.Select(attrs={'class': get_extra_class('form')})
     )
 
     class Meta:
@@ -72,7 +72,7 @@ def get_settings_key(self):
         ''' Finds its own class in settings.FEEDBACK_FORMS dictionary and returns appropriate key '''
 
         reverse_forms_dict = dict(
-            (v.rsplit('.', 1)[1], k) for k, v in FEEDBACK_FORMS.iteritems()
+            (v.rsplit('.', 1)[1], k) for k, v in FEEDBACK_FORMS.items()
         )
         return reverse_forms_dict.get(self.__class__.__name__, DEFAULT_FORM_KEY)
 
@@ -109,8 +109,8 @@ def clean(self):
             if len(self.cleaned_data.get('message_', '')):
                 self._errors['message_'] = 'unhuman message found'
         if FEEDBACK_ANTISPAM['BLOCKING_EXTERNAL_LINKS']:
-            for key, value in self.cleaned_data.iteritems():
-                if isinstance(value, unicode) and 'href=' in value:
+            for key, value in self.cleaned_data.items():
+                if isinstance(value, str) and 'href=' in value:
                     self._errors['message_'] = 'external links found'
 
         return self.cleaned_data
@@ -123,7 +123,7 @@ def get_field_value(self, field):
         if hasattr(field.form.fields[field.name], 'choices'):
             for choice in field.form.fields[field.name].choices:
                 if field.data:
-                    if unicode(choice[0]) == unicode(field.data):
+                    if str(choice[0]) == str(field.data):
                         value = choice[1]
                         break
         elif type(field.form.fields[field.name]) is forms.BooleanField:
@@ -162,7 +162,7 @@ def mail(self, request):
 
         message = self.render_message(request)
         headers = {}
-        if self.cleaned_data.has_key('email'):
+        if 'email' in self.cleaned_data:
             headers = {'Reply-to': self.cleaned_data.get('email')}
 
         msg = EmailMessage(self.subject, message, self.sender, self.recipients, headers=headers)

feedback/models.py

@@ -20,7 +20,7 @@ class Meta:
         verbose_name=_('Email'), max_length=200
     )
 
-    def __unicode__(self):
+    def __str__(self):
         return '%s: %s' % (self.name, self.email,) if self.name else self.email
 
 
@@ -67,5 +67,5 @@ class Meta:
         default='', blank=True
     )
 
-    def __unicode__(self):
+    def __str__(self):
         return self.title 

feedback/utils.py

@@ -10,7 +10,7 @@ def import_item(path, error_text):
     module, attr = path[:i], path[i + 1:]
     try:
         return getattr(__import__(module, {}, {}, ['']), attr)
-    except ImportError, e:
+    except ImportError as e:
         raise ImproperlyConfigured('Error importing %s %s: "%s"' % (error_text, path, e))
 
 

setup.py

@@ -39,8 +39,8 @@ def read(fname):
     ],
     packages=find_packages(),
     install_requires=[
-        'django-classy-tags >=0.3,<=0.9.0',
-        'django==1.11.*'
+        'django-classy-tags==0.9.0',
+        'django==2.2.*'
     ],
     include_package_data=True,
     zip_safe=False,