From: Stephen Finucane Date: Wed, 8 Apr 2020 23:10:27 +0000 (+0100) Subject: Remove __future__ imports X-Git-Tag: v3.0.0~76 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=abfd2df5485d313a2835b60afdeb40731448b5b0;p=thirdparty%2Fpatchwork.git Remove __future__ imports All of these are defaults in Python 3 [1]. [1] https://docs.python.org/3.6/library/__future__.html Signed-off-by: Stephen Finucane --- diff --git a/patchwork/migrations/0001_initial.py b/patchwork/migrations/0001_initial.py index 295fa766..581f1263 100644 --- a/patchwork/migrations/0001_initial.py +++ b/patchwork/migrations/0001_initial.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals +import datetime +from django.conf import settings from django.db import models, migrations -import datetime -import patchwork.models import django.db.models.deletion -from django.conf import settings + +import patchwork.models class Migration(migrations.Migration): diff --git a/patchwork/migrations/0002_fix_patch_state_default_values.py b/patchwork/migrations/0002_fix_patch_state_default_values.py index f02c5075..e42f622b 100644 --- a/patchwork/migrations/0002_fix_patch_state_default_values.py +++ b/patchwork/migrations/0002_fix_patch_state_default_values.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations import django.db.models.deletion diff --git a/patchwork/migrations/0003_add_check_model.py b/patchwork/migrations/0003_add_check_model.py index d296e912..f8f5a67e 100644 --- a/patchwork/migrations/0003_add_check_model.py +++ b/patchwork/migrations/0003_add_check_model.py @@ -1,8 +1,6 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals +import datetime from django.db import models, migrations -import datetime from django.conf import settings import django.db.models.deletion diff --git a/patchwork/migrations/0004_add_delegation_rule_model.py b/patchwork/migrations/0004_add_delegation_rule_model.py index 717c10d9..01682b5d 100644 --- a/patchwork/migrations/0004_add_delegation_rule_model.py +++ b/patchwork/migrations/0004_add_delegation_rule_model.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models from django.conf import settings import django.db.models.deletion diff --git a/patchwork/migrations/0005_unselectable_maintainer_projects.py b/patchwork/migrations/0005_unselectable_maintainer_projects.py index 7d6be1bd..2406820f 100644 --- a/patchwork/migrations/0005_unselectable_maintainer_projects.py +++ b/patchwork/migrations/0005_unselectable_maintainer_projects.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0006_add_patch_diff.py b/patchwork/migrations/0006_add_patch_diff.py index 118cf136..61ed2966 100644 --- a/patchwork/migrations/0006_add_patch_diff.py +++ b/patchwork/migrations/0006_add_patch_diff.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0007_move_comment_content_to_patch_content.py b/patchwork/migrations/0007_move_comment_content_to_patch_content.py index 45776a37..7c494756 100644 --- a/patchwork/migrations/0007_move_comment_content_to_patch_content.py +++ b/patchwork/migrations/0007_move_comment_content_to_patch_content.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import connection, migrations diff --git a/patchwork/migrations/0008_add_email_mixin.py b/patchwork/migrations/0008_add_email_mixin.py index e7ffd161..05be9c76 100644 --- a/patchwork/migrations/0008_add_email_mixin.py +++ b/patchwork/migrations/0008_add_email_mixin.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0009_add_submission_model.py b/patchwork/migrations/0009_add_submission_model.py index f3468e6f..c3943040 100644 --- a/patchwork/migrations/0009_add_submission_model.py +++ b/patchwork/migrations/0009_add_submission_model.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0010_migrate_data_from_submission_to_patch.py b/patchwork/migrations/0010_migrate_data_from_submission_to_patch.py index c3e25b98..3b802336 100644 --- a/patchwork/migrations/0010_migrate_data_from_submission_to_patch.py +++ b/patchwork/migrations/0010_migrate_data_from_submission_to_patch.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/patchwork/migrations/0011_remove_temp_fields.py b/patchwork/migrations/0011_remove_temp_fields.py index ffe73da6..d7596324 100644 --- a/patchwork/migrations/0011_remove_temp_fields.py +++ b/patchwork/migrations/0011_remove_temp_fields.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0012_add_coverletter_model.py b/patchwork/migrations/0012_add_coverletter_model.py index a89cabdb..76c7d5d5 100644 --- a/patchwork/migrations/0012_add_coverletter_model.py +++ b/patchwork/migrations/0012_add_coverletter_model.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0013_slug_check_context.py b/patchwork/migrations/0013_slug_check_context.py index c20ed738..ecf6fecf 100644 --- a/patchwork/migrations/0013_slug_check_context.py +++ b/patchwork/migrations/0013_slug_check_context.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0014_remove_userprofile_primary_project.py b/patchwork/migrations/0014_remove_userprofile_primary_project.py index 6c6dc431..15aea2f6 100644 --- a/patchwork/migrations/0014_remove_userprofile_primary_project.py +++ b/patchwork/migrations/0014_remove_userprofile_primary_project.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/patchwork/migrations/0015_add_series_models.py b/patchwork/migrations/0015_add_series_models.py index 32596c3e..1fd1e01b 100644 --- a/patchwork/migrations/0015_add_series_models.py +++ b/patchwork/migrations/0015_add_series_models.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0016_series_project.py b/patchwork/migrations/0016_series_project.py index 8f28ea7f..63805769 100644 --- a/patchwork/migrations/0016_series_project.py +++ b/patchwork/migrations/0016_series_project.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0017_improved_delegation_rule_docs.py b/patchwork/migrations/0017_improved_delegation_rule_docs.py index 95ae8546..20bfb91d 100644 --- a/patchwork/migrations/0017_improved_delegation_rule_docs.py +++ b/patchwork/migrations/0017_improved_delegation_rule_docs.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0018_add_event_model.py b/patchwork/migrations/0018_add_event_model.py index e03cc407..181f89dc 100644 --- a/patchwork/migrations/0018_add_event_model.py +++ b/patchwork/migrations/0018_add_event_model.py @@ -1,7 +1,5 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime + from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0019_userprofile_show_ids.py b/patchwork/migrations/0019_userprofile_show_ids.py index b7563b39..c88c9dea 100644 --- a/patchwork/migrations/0019_userprofile_show_ids.py +++ b/patchwork/migrations/0019_userprofile_show_ids.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0020_tag_show_column.py b/patchwork/migrations/0020_tag_show_column.py index e191ca61..56278d74 100644 --- a/patchwork/migrations/0020_tag_show_column.py +++ b/patchwork/migrations/0020_tag_show_column.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0021_django_1_10_fixes.py b/patchwork/migrations/0021_django_1_10_fixes.py index 79e7726b..90bc10dd 100644 --- a/patchwork/migrations/0021_django_1_10_fixes.py +++ b/patchwork/migrations/0021_django_1_10_fixes.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/patchwork/migrations/0022_add_subject_match_to_project.py b/patchwork/migrations/0022_add_subject_match_to_project.py index 9ca82246..1596d22b 100644 --- a/patchwork/migrations/0022_add_subject_match_to_project.py +++ b/patchwork/migrations/0022_add_subject_match_to_project.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0023_timezone_unify.py b/patchwork/migrations/0023_timezone_unify.py index c73d3247..be9213c8 100644 --- a/patchwork/migrations/0023_timezone_unify.py +++ b/patchwork/migrations/0023_timezone_unify.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - import datetime from django.db import migrations, models diff --git a/patchwork/migrations/0024_patch_patch_project.py b/patchwork/migrations/0024_patch_patch_project.py index 7e5f097f..8df51917 100644 --- a/patchwork/migrations/0024_patch_patch_project.py +++ b/patchwork/migrations/0024_patch_patch_project.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0025_add_regex_validators.py b/patchwork/migrations/0025_add_regex_validators.py index 145ae388..0615cc28 100644 --- a/patchwork/migrations/0025_add_regex_validators.py +++ b/patchwork/migrations/0025_add_regex_validators.py @@ -1,7 +1,5 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models + import patchwork.models diff --git a/patchwork/migrations/0026_add_user_bundles_backref.py b/patchwork/migrations/0026_add_user_bundles_backref.py index fc233b6c..3c649d9d 100644 --- a/patchwork/migrations/0026_add_user_bundles_backref.py +++ b/patchwork/migrations/0026_add_user_bundles_backref.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0027_remove_series_ordering.py b/patchwork/migrations/0027_remove_series_ordering.py index ef6c169c..ab725cfc 100644 --- a/patchwork/migrations/0027_remove_series_ordering.py +++ b/patchwork/migrations/0027_remove_series_ordering.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/patchwork/migrations/0028_add_comment_date_index.py b/patchwork/migrations/0028_add_comment_date_index.py index e6fd8074..fbb4d7fa 100644 --- a/patchwork/migrations/0028_add_comment_date_index.py +++ b/patchwork/migrations/0028_add_comment_date_index.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0029_add_list_covering_index.py b/patchwork/migrations/0029_add_list_covering_index.py index c7c19f5b..bd84e27a 100644 --- a/patchwork/migrations/0029_add_list_covering_index.py +++ b/patchwork/migrations/0029_add_list_covering_index.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0030_add_submission_covering_index.py b/patchwork/migrations/0030_add_submission_covering_index.py index 3cf009be..05bd642a 100644 --- a/patchwork/migrations/0030_add_submission_covering_index.py +++ b/patchwork/migrations/0030_add_submission_covering_index.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0031_add_patch_series_fields.py b/patchwork/migrations/0031_add_patch_series_fields.py index 2f31e565..c4e04367 100644 --- a/patchwork/migrations/0031_add_patch_series_fields.py +++ b/patchwork/migrations/0031_add_patch_series_fields.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0032_migrate_data_from_series_patch_to_patch.py b/patchwork/migrations/0032_migrate_data_from_series_patch_to_patch.py index 4083847f..1cc809cb 100644 --- a/patchwork/migrations/0032_migrate_data_from_series_patch_to_patch.py +++ b/patchwork/migrations/0032_migrate_data_from_series_patch_to_patch.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations diff --git a/patchwork/migrations/0033_remove_patch_series_model.py b/patchwork/migrations/0033_remove_patch_series_model.py index 45bd422b..7add14dd 100644 --- a/patchwork/migrations/0033_remove_patch_series_model.py +++ b/patchwork/migrations/0033_remove_patch_series_model.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/patchwork/migrations/0034_project_list_archive_url.py b/patchwork/migrations/0034_project_list_archive_url.py index a9e903f1..54dbcb5f 100644 --- a/patchwork/migrations/0034_project_list_archive_url.py +++ b/patchwork/migrations/0034_project_list_archive_url.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0035_project_list_archive_url_format.py b/patchwork/migrations/0035_project_list_archive_url_format.py index f2353bb3..4f6e0f42 100644 --- a/patchwork/migrations/0035_project_list_archive_url_format.py +++ b/patchwork/migrations/0035_project_list_archive_url_format.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0036_project_commit_url_format.py b/patchwork/migrations/0036_project_commit_url_format.py index 988b3659..f74d8cf1 100644 --- a/patchwork/migrations/0036_project_commit_url_format.py +++ b/patchwork/migrations/0036_project_commit_url_format.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/patchwork/migrations/0038_state_slug.py b/patchwork/migrations/0038_state_slug.py index b723208a..6355180b 100644 --- a/patchwork/migrations/0038_state_slug.py +++ b/patchwork/migrations/0038_state_slug.py @@ -1,7 +1,3 @@ -# -*- coding: utf-8 -*- - -from __future__ import unicode_literals - from django.db import migrations, models, transaction from django.utils.text import slugify diff --git a/patchwork/migrations/0040_add_related_patches.py b/patchwork/migrations/0040_add_related_patches.py index b2bc249a..fb0812b8 100644 --- a/patchwork/migrations/0040_add_related_patches.py +++ b/patchwork/migrations/0040_add_related_patches.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion