diff --git a/.gitignore b/.gitignore index 6061583..6c0c7e8 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ *.sqlite3 +__pycache__ diff --git a/grants/migrations/0001_initial.py b/grants/migrations/0001_initial.py index eaad705..1d00dc2 100644 --- a/grants/migrations/0001_initial.py +++ b/grants/migrations/0001_initial.py @@ -64,7 +64,7 @@ class Migration(migrations.Migration): name='Question', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('type', models.CharField(max_length=50, choices=[(b'boolean', b'Yes/No'), (b'text', b'Text'), (b'integer', b'Integer value')])), + ('type', models.CharField(max_length=50, choices=[('boolean', 'Yes/No'), ('text', 'Text'), ('integer', 'Integer value')])), ('question', models.TextField()), ('order', models.IntegerField(default=0)), ('program', models.ForeignKey(to='grants.Program', to_field='id', on_delete=models.CASCADE)), @@ -84,7 +84,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(max_length=100)), - ('type', models.CharField(max_length=50, choices=[(b'money', b'Money'), (b'ticket', b'Ticket'), (b'place', b'Place'), (b'accomodation', b'Accomodation')])), + ('type', models.CharField(max_length=50, choices=[('money', 'Money'), ('ticket', 'Ticket'), ('place', 'Place'), ('accomodation', 'Accomodation')])), ('program', models.ForeignKey(to='grants.Program', to_field='id', on_delete=models.CASCADE)), ], options={ diff --git a/grants/migrations/0004_auto_20140624_0435.py b/grants/migrations/0004_auto_20140624_0435.py index a741a14..1c353fb 100644 --- a/grants/migrations/0004_auto_20140624_0435.py +++ b/grants/migrations/0004_auto_20140624_0435.py @@ -14,10 +14,10 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='question', name='type', - field=models.CharField(max_length=50, choices=[(b'boolean', b'Yes/No'), (b'text', b'Short text'), (b'textarea', b'Long text'), (b'integer', b'Integer value')]), + field=models.CharField(max_length=50, choices=[('boolean', 'Yes/No'), ('text', 'Short text'), ('textarea', 'Long text'), ('integer', 'Integer value')]), ), migrations.AlterUniqueTogether( name='applicant', - unique_together=set([(b'program', b'email')]), + unique_together=set([('program', 'email')]), ), ] diff --git a/grants/migrations/0005_auto_20140624_1719.py b/grants/migrations/0005_auto_20140624_1719.py index 0f19e52..c964d8a 100644 --- a/grants/migrations/0005_auto_20140624_1719.py +++ b/grants/migrations/0005_auto_20140624_1719.py @@ -29,10 +29,10 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='score', - unique_together=set([(b'applicant', b'user')]), + unique_together=set([('applicant', 'user')]), ), migrations.AlterUniqueTogether( name='answer', - unique_together=set([(b'applicant', b'question')]), + unique_together=set([('applicant', 'question')]), ), ] diff --git a/grants/migrations/0006_auto_20140625_0139.py b/grants/migrations/0006_auto_20140625_0139.py index 2dd6fe5..77bad6a 100644 --- a/grants/migrations/0006_auto_20140625_0139.py +++ b/grants/migrations/0006_auto_20140625_0139.py @@ -27,11 +27,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='score', name='comment', - field=models.TextField(help_text=b'Seen only by other voters, not by the applicant', null=True, blank=True), + field=models.TextField(help_text='Seen only by other voters, not by the applicant', null=True, blank=True), ), migrations.AlterField( model_name='score', name='score', - field=models.FloatField(help_text=b'From 0 (terrible) to 5 (excellent)', null=True, blank=True), + field=models.FloatField(help_text='From 0 (terrible) to 5 (excellent)', null=True, blank=True), ), ] diff --git a/grants/migrations/0007_auto_20140625_0314.py b/grants/migrations/0007_auto_20140625_0314.py index cf08c5f..a56f79a 100644 --- a/grants/migrations/0007_auto_20140625_0314.py +++ b/grants/migrations/0007_auto_20140625_0314.py @@ -25,6 +25,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='allocation', - unique_together=set([(b'applicant', b'resource')]), + unique_together=set([('applicant', 'resource')]), ), ] diff --git a/grants/migrations/0010_auto_20150320_1734.py b/grants/migrations/0010_auto_20150320_1734.py index cc0a082..db93a13 100644 --- a/grants/migrations/0010_auto_20150320_1734.py +++ b/grants/migrations/0010_auto_20150320_1734.py @@ -69,7 +69,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='score', name='score', - field=models.FloatField(help_text=b'From 1 (terrible) to 5 (excellent)', null=True, blank=True), + field=models.FloatField(help_text='From 1 (terrible) to 5 (excellent)', null=True, blank=True), preserve_default=True, ), migrations.AlterField( diff --git a/grants/models.py b/grants/models.py index 579aa0d..a53bed6 100644 --- a/grants/models.py +++ b/grants/models.py @@ -23,7 +23,7 @@ class Program(models.Model): users = models.ManyToManyField("users.User", blank=True) - def __unicode__(self): + def __str__(self): return self.name class urls(Urls): @@ -64,7 +64,7 @@ class Resource(models.Model): class urls(Urls): edit = "{self.program.urls.resources}{self.id}/" - def __unicode__(self): + def __str__(self): return self.name def fa_icon(self): @@ -103,7 +103,7 @@ class Question(models.Model): class urls(Urls): edit = "{self.program.urls.questions}{self.id}/" - def __unicode__(self): + def __str__(self): return self.question def can_delete(self): @@ -125,7 +125,7 @@ class urls(Urls): view = "{self.program.urls.applicants}{self.id}/" allocations = "{view}allocations/" - def __unicode__(self): + def __str__(self): return self.name def average_score(self): diff --git a/users/models.py b/users/models.py index c4923e3..1e5ceb6 100644 --- a/users/models.py +++ b/users/models.py @@ -52,5 +52,5 @@ def email_user(self, subject, message, from_email=None, **kwargs): """ send_mail(subject, message, from_email, [self.email], **kwargs) - def __unicode__(self): + def __str__(self): return self.name or self.email