Skip to content

Commit 8e313e4

Browse files
committed
Adjusted migrations for Python2/3 compatibility.
- Legacy-Id: 16633
1 parent 9a2c409 commit 8e313e4

40 files changed

Lines changed: 240 additions & 240 deletions

ietf/community/migrations/0001_initial.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,15 +26,15 @@ class Migration(migrations.Migration):
2626
name='EmailSubscription',
2727
fields=[
2828
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
29-
('notify_on', models.CharField(choices=[(b'all', b'All changes'), (b'significant', b'Only significant state changes')], default=b'all', max_length=30)),
29+
('notify_on', models.CharField(choices=[('all', 'All changes'), ('significant', 'Only significant state changes')], default='all', max_length=30)),
3030
],
3131
),
3232
migrations.CreateModel(
3333
name='SearchRule',
3434
fields=[
3535
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
36-
('rule_type', models.CharField(choices=[(b'group', b'All I-Ds associated with a particular group'), (b'area', b'All I-Ds associated with all groups in a particular Area'), (b'group_rfc', b'All RFCs associated with a particular group'), (b'area_rfc', b'All RFCs associated with all groups in a particular Area'), (b'state_iab', b'All I-Ds that are in a particular IAB state'), (b'state_iana', b'All I-Ds that are in a particular IANA state'), (b'state_iesg', b'All I-Ds that are in a particular IESG state'), (b'state_irtf', b'All I-Ds that are in a particular IRTF state'), (b'state_ise', b'All I-Ds that are in a particular ISE state'), (b'state_rfceditor', b'All I-Ds that are in a particular RFC Editor state'), (b'state_ietf', b'All I-Ds that are in a particular Working Group state'), (b'author', b'All I-Ds with a particular author'), (b'author_rfc', b'All RFCs with a particular author'), (b'ad', b'All I-Ds with a particular responsible AD'), (b'shepherd', b'All I-Ds with a particular document shepherd'), (b'name_contains', b'All I-Ds with particular text/regular expression in the name')], max_length=30)),
37-
('text', models.CharField(blank=True, default=b'', max_length=255, verbose_name=b'Text/RegExp')),
36+
('rule_type', models.CharField(choices=[('group', 'All I-Ds associated with a particular group'), ('area', 'All I-Ds associated with all groups in a particular Area'), ('group_rfc', 'All RFCs associated with a particular group'), ('area_rfc', 'All RFCs associated with all groups in a particular Area'), ('state_iab', 'All I-Ds that are in a particular IAB state'), ('state_iana', 'All I-Ds that are in a particular IANA state'), ('state_iesg', 'All I-Ds that are in a particular IESG state'), ('state_irtf', 'All I-Ds that are in a particular IRTF state'), ('state_ise', 'All I-Ds that are in a particular ISE state'), ('state_rfceditor', 'All I-Ds that are in a particular RFC Editor state'), ('state_ietf', 'All I-Ds that are in a particular Working Group state'), ('author', 'All I-Ds with a particular author'), ('author_rfc', 'All RFCs with a particular author'), ('ad', 'All I-Ds with a particular responsible AD'), ('shepherd', 'All I-Ds with a particular document shepherd'), ('name_contains', 'All I-Ds with particular text/regular expression in the name')], max_length=30)),
37+
('text', models.CharField(blank=True, default='', max_length=255, verbose_name='Text/RegExp')),
3838
('community_list', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='community.CommunityList')),
3939
],
4040
),

ietf/doc/migrations/0001_initial.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class Migration(migrations.Migration):
4040
name='DeletedEvent',
4141
fields=[
4242
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
43-
('json', models.TextField(help_text=b'Deleted object in JSON format, with attribute names chosen to be suitable for passing into the relevant create method.')),
43+
('json', models.TextField(help_text='Deleted object in JSON format, with attribute names chosen to be suitable for passing into the relevant create method.')),
4444
('time', models.DateTimeField(default=datetime.datetime.now)),
4545
],
4646
),
@@ -58,9 +58,9 @@ class Migration(migrations.Migration):
5858
name='DocEvent',
5959
fields=[
6060
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
61-
('time', models.DateTimeField(db_index=True, default=datetime.datetime.now, help_text=b'When the event happened')),
61+
('time', models.DateTimeField(db_index=True, default=datetime.datetime.now, help_text='When the event happened')),
6262
('type', models.CharField(choices=[(b'new_revision', b'Added new revision'), (b'new_submission', b'Uploaded new revision'), (b'changed_document', b'Changed document metadata'), (b'added_comment', b'Added comment'), (b'added_message', b'Added message'), (b'edited_authors', b'Edited the documents author list'), (b'deleted', b'Deleted document'), (b'changed_state', b'Changed state'), (b'changed_stream', b'Changed document stream'), (b'expired_document', b'Expired document'), (b'extended_expiry', b'Extended expiry of document'), (b'requested_resurrect', b'Requested resurrect'), (b'completed_resurrect', b'Completed resurrect'), (b'changed_consensus', b'Changed consensus'), (b'published_rfc', b'Published RFC'), (b'added_suggested_replaces', b'Added suggested replacement relationships'), (b'reviewed_suggested_replaces', b'Reviewed suggested replacement relationships'), (b'changed_group', b'Changed group'), (b'changed_protocol_writeup', b'Changed protocol writeup'), (b'changed_charter_milestone', b'Changed charter milestone'), (b'initial_review', b'Set initial review time'), (b'changed_review_announcement', b'Changed WG Review text'), (b'changed_action_announcement', b'Changed WG Action text'), (b'started_iesg_process', b'Started IESG process on document'), (b'created_ballot', b'Created ballot'), (b'closed_ballot', b'Closed ballot'), (b'sent_ballot_announcement', b'Sent ballot announcement'), (b'changed_ballot_position', b'Changed ballot position'), (b'changed_ballot_approval_text', b'Changed ballot approval text'), (b'changed_ballot_writeup_text', b'Changed ballot writeup text'), (b'changed_rfc_editor_note_text', b'Changed RFC Editor Note text'), (b'changed_last_call_text', b'Changed last call text'), (b'requested_last_call', b'Requested last call'), (b'sent_last_call', b'Sent last call'), (b'scheduled_for_telechat', b'Scheduled for telechat'), (b'iesg_approved', b'IESG approved document (no problem)'), (b'iesg_disapproved', b'IESG disapproved document (do not publish)'), (b'approved_in_minute', b'Approved in minute'), (b'iana_review', b'IANA review comment'), (b'rfc_in_iana_registry', b'RFC is in IANA registry'), (b'rfc_editor_received_announcement', b'Announcement was received by RFC Editor'), (b'requested_publication', b'Publication at RFC Editor requested'), (b'sync_from_rfc_editor', b'Received updated information from RFC Editor'), (b'requested_review', b'Requested review'), (b'assigned_review_request', b'Assigned review request'), (b'closed_review_request', b'Closed review request'), (b'downref_approved', b'Downref approved')], max_length=50)),
63-
('rev', models.CharField(blank=True, max_length=16, null=True, verbose_name=b'revision')),
63+
('rev', models.CharField(blank=True, max_length=16, null=True, verbose_name='revision')),
6464
('desc', models.TextField()),
6565
],
6666
options={
@@ -74,7 +74,7 @@ class Migration(migrations.Migration):
7474
('time', models.DateTimeField(default=datetime.datetime.now)),
7575
('title', models.CharField(max_length=255, validators=[django.core.validators.RegexValidator(message='Please enter a string without control characters.', regex='^[^\x00-\x1f]*$')])),
7676
('abstract', models.TextField(blank=True)),
77-
('rev', models.CharField(blank=True, max_length=16, verbose_name=b'revision')),
77+
('rev', models.CharField(blank=True, max_length=16, verbose_name='revision')),
7878
('pages', models.IntegerField(blank=True, null=True)),
7979
('words', models.IntegerField(blank=True, null=True)),
8080
('order', models.IntegerField(blank=True, default=1)),
@@ -94,8 +94,8 @@ class Migration(migrations.Migration):
9494
name='DocHistoryAuthor',
9595
fields=[
9696
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
97-
('affiliation', models.CharField(blank=True, help_text=b'Organization/company used by author for submission', max_length=100)),
98-
('country', models.CharField(blank=True, help_text=b'Country used by author for submission', max_length=255)),
97+
('affiliation', models.CharField(blank=True, help_text='Organization/company used by author for submission', max_length=100)),
98+
('country', models.CharField(blank=True, help_text='Country used by author for submission', max_length=255)),
9999
('order', models.IntegerField(default=1)),
100100
],
101101
options={
@@ -117,7 +117,7 @@ class Migration(migrations.Migration):
117117
('time', models.DateTimeField(default=datetime.datetime.now)),
118118
('title', models.CharField(max_length=255, validators=[django.core.validators.RegexValidator(message='Please enter a string without control characters.', regex='^[^\x00-\x1f]*$')])),
119119
('abstract', models.TextField(blank=True)),
120-
('rev', models.CharField(blank=True, max_length=16, verbose_name=b'revision')),
120+
('rev', models.CharField(blank=True, max_length=16, verbose_name='revision')),
121121
('pages', models.IntegerField(blank=True, null=True)),
122122
('words', models.IntegerField(blank=True, null=True)),
123123
('order', models.IntegerField(blank=True, default=1)),
@@ -127,8 +127,8 @@ class Migration(migrations.Migration):
127127
('note', models.TextField(blank=True)),
128128
('internal_comments', models.TextField(blank=True)),
129129
('name', models.CharField(max_length=255, primary_key=True, serialize=False, validators=[django.core.validators.RegexValidator(b'^[-a-z0-9]+$', b'Provide a valid document name consisting of lowercase letters, numbers and hyphens.', b'invalid')])),
130-
('ad', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_document_set', to='person.Person', verbose_name=b'area director')),
131-
('formal_languages', models.ManyToManyField(blank=True, help_text=b'Formal languages used in document', to='name.FormalLanguageName')),
130+
('ad', ietf.utils.models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='ad_document_set', to='person.Person', verbose_name='area director')),
131+
('formal_languages', models.ManyToManyField(blank=True, help_text='Formal languages used in document', to='name.FormalLanguageName')),
132132
],
133133
options={
134134
'abstract': False,
@@ -138,11 +138,11 @@ class Migration(migrations.Migration):
138138
name='DocumentAuthor',
139139
fields=[
140140
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
141-
('affiliation', models.CharField(blank=True, help_text=b'Organization/company used by author for submission', max_length=100)),
142-
('country', models.CharField(blank=True, help_text=b'Country used by author for submission', max_length=255)),
141+
('affiliation', models.CharField(blank=True, help_text='Organization/company used by author for submission', max_length=100)),
142+
('country', models.CharField(blank=True, help_text='Country used by author for submission', max_length=255)),
143143
('order', models.IntegerField(default=1)),
144144
('document', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
145-
('email', ietf.utils.models.ForeignKey(blank=True, help_text=b'Email address used by author for submission', null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
145+
('email', ietf.utils.models.ForeignKey(blank=True, help_text='Email address used by author for submission', null=True, on_delete=django.db.models.deletion.CASCADE, to='person.Email')),
146146
('person', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='person.Person')),
147147
],
148148
options={
@@ -154,7 +154,7 @@ class Migration(migrations.Migration):
154154
name='DocumentURL',
155155
fields=[
156156
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
157-
('desc', models.CharField(blank=True, default=b'', max_length=255)),
157+
('desc', models.CharField(blank=True, default='', max_length=255)),
158158
('url', models.URLField(max_length=512)),
159159
('doc', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='doc.Document')),
160160
('tag', ietf.utils.models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='name.DocUrlTagName')),
@@ -197,7 +197,7 @@ class Migration(migrations.Migration):
197197
name='StateType',
198198
fields=[
199199
('slug', models.CharField(max_length=30, primary_key=True, serialize=False)),
200-
('label', models.CharField(help_text=b'Label that should be used (e.g. in admin) for state drop-down for this type of state', max_length=255)),
200+
('label', models.CharField(help_text='Label that should be used (e.g. in admin) for state drop-down for this type of state', max_length=255)),
201201
],
202202
),
203203
migrations.CreateModel(
@@ -219,10 +219,10 @@ class Migration(migrations.Migration):
219219
name='BallotPositionDocEvent',
220220
fields=[
221221
('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
222-
('discuss', models.TextField(blank=True, help_text=b'Discuss text if position is discuss')),
223-
('discuss_time', models.DateTimeField(blank=True, help_text=b'Time discuss text was written', null=True)),
224-
('comment', models.TextField(blank=True, help_text=b'Optional comment')),
225-
('comment_time', models.DateTimeField(blank=True, help_text=b'Time optional comment was written', null=True)),
222+
('discuss', models.TextField(blank=True, help_text='Discuss text if position is discuss')),
223+
('discuss_time', models.DateTimeField(blank=True, help_text='Time discuss text was written', null=True)),
224+
('comment', models.TextField(blank=True, help_text='Optional comment')),
225+
('comment_time', models.DateTimeField(blank=True, help_text='Time optional comment was written', null=True)),
226226
],
227227
bases=('doc.docevent',),
228228
),
@@ -238,7 +238,7 @@ class Migration(migrations.Migration):
238238
name='EditedAuthorsDocEvent',
239239
fields=[
240240
('docevent_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='doc.DocEvent')),
241-
('basis', models.CharField(help_text=b'What is the source or reasoning for the changes to the author list', max_length=255)),
241+
('basis', models.CharField(help_text='What is the source or reasoning for the changes to the author list', max_length=255)),
242242
],
243243
bases=('doc.docevent',),
244244
),

0 commit comments

Comments
 (0)