Adding python_2_unicode_compatible from @fsx999, #Fix 282 and Close #342

Conflicts:
	wiki/plugins/attachments/models.py

wiki/models/article.py

@@ -187,6 +187,7 @@ class Article(models.Model):
             return reverse('wiki:get', kwargs={'article_id': self.id})
         
 
+@python_2_unicode_compatible
 class ArticleForObject(models.Model):
     
     objects = managers.ArticleFkManager()
@@ -200,7 +201,10 @@ class ArticleForObject(models.Model):
     content_object = generic.GenericForeignKey("content_type", "object_id")
     
     is_mptt = models.BooleanField(default=False, editable=False)
-    
+
+    def __str__(self):
+        return "{}".format(self.article)
+
     class Meta:
         app_label = settings.APP_LABEL
         verbose_name = _('Article for object')

wiki/plugins/attachments/models.py

@@ -6,6 +6,7 @@ import os.path
 from django.db import models
 from django.utils.translation import ugettext
 from django.utils.translation import ugettext_lazy as _
+from django.utils.encoding import python_2_unicode_compatible
 from django.conf import settings as django_settings
 
 from . import settings
@@ -18,10 +19,12 @@ from six.moves import map
 from six.moves import zip
 from six.moves import range
 
+
 class IllegalFileExtension(Exception):
     """File extension on upload is not allowed"""
     pass
 
+@python_2_unicode_compatible
 class Attachment(ReusablePlugin):
 
     objects = managers.ArticleFkManager()
@@ -49,7 +52,7 @@ class Attachment(ReusablePlugin):
         if settings.APP_LABEL:
             app_label = settings.APP_LABEL
     
-    def __unicode__(self):
+    def __str__(self):
         return "%s: %s" % (self.article.current_revision.title, self.original_filename)    
 
 def extension_allowed(filename):
@@ -90,6 +93,7 @@ def upload_path(instance, filename):
     return path.join(upload_path, filename)
 
 
+@python_2_unicode_compatible
 class AttachmentRevision(BaseRevisionMixin, models.Model):
     
     attachment = models.ForeignKey('Attachment')
@@ -153,7 +157,7 @@ class AttachmentRevision(BaseRevisionMixin, models.Model):
             self.attachment.current_revision = self
             self.attachment.save()
 
-    def __unicode__(self):
+    def __str__(self):
         return "%s: %s (r%d)" % (self.attachment.article.current_revision.title, 
                                  self.attachment.original_filename,
                                  self.revision_number)