From 671afb17ec526ae2e989fe8e52d43ef07cf1057c Mon Sep 17 00:00:00 2001 From: Emmanuel Cazenave Date: Tue, 4 Feb 2020 17:01:46 +0100 Subject: [PATCH] migration: use text instead of bytes (#39533) --- atreal_openads/migrations/0001_initial.py | 42 +++++++++++------------ 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/atreal_openads/migrations/0001_initial.py b/atreal_openads/migrations/0001_initial.py index 820ad75..2ac505a 100644 --- a/atreal_openads/migrations/0001_initial.py +++ b/atreal_openads/migrations/0001_initial.py @@ -25,12 +25,12 @@ class Migration(migrations.Migration): ('slug', models.SlugField(unique=True, verbose_name='Identifier')), ('basic_auth_username', models.CharField(blank=True, max_length=128, verbose_name='Basic authentication username')), ('basic_auth_password', models.CharField(blank=True, max_length=128, verbose_name='Basic authentication password')), - ('client_certificate', models.FileField(blank=True, null=True, upload_to=b'', verbose_name='TLS client certificate')), - ('trusted_certificate_authorities', models.FileField(blank=True, null=True, upload_to=b'', verbose_name='TLS trusted CAs')), + ('client_certificate', models.FileField(blank=True, null=True, upload_to='', verbose_name='TLS client certificate')), + ('trusted_certificate_authorities', models.FileField(blank=True, null=True, upload_to='', verbose_name='TLS trusted CAs')), ('verify_cert', models.BooleanField(default=True, verbose_name='TLS verify certificates')), ('http_proxy', models.CharField(blank=True, max_length=128, verbose_name='HTTP and HTTPS proxy')), ('default_collectivite_openADS_id', models.PositiveIntegerField(blank=True, default=0, help_text='ex: 3', verbose_name="Default 'collectivite' (identifier in openADS)")), - ('openADS_API_url', models.URLField(default=b'', help_text='ex: https://openads.your_domain.net/api/', max_length=255, verbose_name='openADS API URL')), + ('openADS_API_url', models.URLField(default='', help_text='ex: https://openads.your_domain.net/api/', max_length=255, verbose_name='openADS API URL')), ('users', models.ManyToManyField(blank=True, related_name='_atrealopenads_users_+', related_query_name='+', to='base.ApiUser')), ], options={ @@ -44,7 +44,7 @@ class Migration(migrations.Migration): name='Collectivite', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(blank=True, default=b'', max_length=150, verbose_name='Name')), + ('name', models.CharField(blank=True, default='', max_length=150, verbose_name='Name')), ('openADS_id', models.PositiveIntegerField(help_text='ex: 3', verbose_name='openADS identifier')), ('connecteur', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='collectivites', related_query_name='collectivite', to='atreal_openads.AtrealOpenads')), ], @@ -61,14 +61,14 @@ class Migration(migrations.Migration): ('numero_demande', models.CharField(max_length=20, verbose_name='Tracking code')), ('numero_dossier', models.CharField(max_length=20, verbose_name='Numero dossier')), ('type_fichier', models.CharField(max_length=10, verbose_name='Type')), - ('file_hash', models.CharField(blank=True, default=b'', max_length=100, verbose_name='Hash')), - ('orig_filename', models.CharField(blank=True, default=b'', max_length=100, verbose_name='Filename')), - ('content_type', models.CharField(blank=True, default=b'', max_length=100, verbose_name='Content type')), + ('file_hash', models.CharField(blank=True, default='', max_length=100, verbose_name='Hash')), + ('orig_filename', models.CharField(blank=True, default='', max_length=100, verbose_name='Filename')), + ('content_type', models.CharField(blank=True, default='', max_length=100, verbose_name='Content type')), ('size', models.PositiveIntegerField(default=0, verbose_name='Size')), ('upload_file', models.FileField(blank=True, null=True, upload_to=atreal_openads.utils.get_upload_path, verbose_name='File')), ('upload_attempt', models.PositiveIntegerField(blank=True, default=0, verbose_name='Upload attempt')), - ('upload_status', models.CharField(choices=[(b'pending', 'Pending'), (b'uploading', 'Uploading'), (b'failed', 'Failed'), (b'success', 'Success')], default=b'pending', max_length=10, verbose_name='Upload status')), - ('upload_msg', models.CharField(blank=True, default=b'', max_length=255, verbose_name='Upload message')), + ('upload_status', models.CharField(choices=[('pending', 'Pending'), ('uploading', 'Uploading'), ('failed', 'Failed'), ('success', 'Success')], default='pending', max_length=10, verbose_name='Upload status')), + ('upload_msg', models.CharField(blank=True, default='', max_length=255, verbose_name='Upload message')), ('last_update_datetime', models.DateTimeField(auto_now=True, verbose_name='Last update')), ('collectivite', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='forward_files', related_query_name='forward_file', to='atreal_openads.Collectivite')), ('connecteur', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='forward_files', related_query_name='forward_file', to='atreal_openads.AtrealOpenads')), @@ -100,51 +100,51 @@ class Migration(migrations.Migration): ), migrations.AddIndex( model_name='guichet', - index=models.Index(fields=[b'collectivite'], name=b'su_collectivite_idx'), + index=models.Index(fields=['collectivite'], name='su_collectivite_idx'), ), migrations.AddIndex( model_name='forwardfile', - index=models.Index(fields=[b'connecteur'], name=b'ff_connecteur_idx'), + index=models.Index(fields=['connecteur'], name='ff_connecteur_idx'), ), migrations.AddIndex( model_name='forwardfile', - index=models.Index(fields=[b'collectivite'], name=b'ff_collectivite_idx'), + index=models.Index(fields=['collectivite'], name='ff_collectivite_idx'), ), migrations.AddIndex( model_name='forwardfile', - index=models.Index(fields=[b'numero_demande', b'numero_dossier'], name=b'ff_deman_doss_idx'), + index=models.Index(fields=['numero_demande', 'numero_dossier'], name='ff_deman_doss_idx'), ), migrations.AddIndex( model_name='forwardfile', - index=models.Index(fields=[b'numero_demande'], name=b'ff_demande_idx'), + index=models.Index(fields=['numero_demande'], name='ff_demande_idx'), ), migrations.AddIndex( model_name='forwardfile', - index=models.Index(fields=[b'numero_dossier'], name=b'ff_dossier_idx'), + index=models.Index(fields=['numero_dossier'], name='ff_dossier_idx'), ), migrations.AddIndex( model_name='forwardfile', - index=models.Index(fields=[b'orig_filename'], name=b'ff_filename_idx'), + index=models.Index(fields=['orig_filename'], name='ff_filename_idx'), ), migrations.AddIndex( model_name='forwardfile', - index=models.Index(fields=[b'upload_status'], name=b'ff_status_idx'), + index=models.Index(fields=['upload_status'], name='ff_status_idx'), ), migrations.AddIndex( model_name='forwardfile', - index=models.Index(fields=[b'last_update_datetime'], name=b'ff_last_up_dt_idx'), + index=models.Index(fields=['last_update_datetime'], name='ff_last_up_dt_idx'), ), migrations.AddIndex( model_name='collectivite', - index=models.Index(fields=[b'connecteur', b'openADS_id'], name=b'col_conn_openADSid_idx'), + index=models.Index(fields=['connecteur', 'openADS_id'], name='col_conn_openADSid_idx'), ), migrations.AddIndex( model_name='collectivite', - index=models.Index(fields=[b'connecteur'], name=b'col_connecteur_idx'), + index=models.Index(fields=['connecteur'], name='col_connecteur_idx'), ), migrations.AddIndex( model_name='collectivite', - index=models.Index(fields=[b'openADS_id'], name=b'col_openADS_id_idx'), + index=models.Index(fields=['openADS_id'], name='col_openADS_id_idx'), ), migrations.AlterUniqueTogether( name='collectivite',