beaucoup de modifs dans le fichier settings.py

basé sur le fichier de settings de django 1.7

modifs sur models : unicode devient __str__

3 files changed, 5 insertions, 5 deletions

diff --git a/papillon/polls/admin.py b/papillon/polls/admin.py
index a5021b6..7153a2e 100644
--- a/papillon/polls/admin.py
+++ b/papillon/polls/admin.py
@@ -21,7 +21,7 @@
 Settings for administration pages
 """
 
-from papillon.polls.models import Poll, Category
+from polls.models import Poll, Category
 from django.contrib import admin
 
 
diff --git a/papillon/polls/forms.py b/papillon/polls/forms.py
index 359410d..ac1e68c 100644
--- a/papillon/polls/forms.py
+++ b/papillon/polls/forms.py
@@ -27,7 +27,7 @@ from django import forms
 from django.contrib.admin import widgets as adminwidgets
 from django.utils.translation import gettext_lazy as _
 
-from papillon.polls.models import Poll, Category, Choice, Comment
+from polls.models import Poll, Category, Choice, Comment
 from django.conf import settings
 
 
diff --git a/papillon/polls/models.py b/papillon/polls/models.py
index 506ad79..aa6510a 100644
--- a/papillon/polls/models.py
+++ b/papillon/polls/models.py
@@ -33,7 +33,7 @@ class Category(models.Model):
     name = models.CharField(max_length=100)
     description = models.TextField()
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
@@ -145,7 +145,7 @@ the poll/check this option to reopen it"))
     class Meta:
         ordering = ['-modification_date']
 
-    def __unicode__(self):
+    def __str__(self):
         return self.name
 
 
@@ -169,7 +169,7 @@ class Voter(models.Model):
     class Meta:
         ordering = ['creation_date']
 
-    def __unicode__(self):
+    def __str__(self):
         return _("Vote from %(user)s") % {'user': self.user.name}
 
     def getVotes(self, choice_ids):