From b2ad8fd7475e9cf34c7f59480ce4ac8093916ec0 Mon Sep 17 00:00:00 2001 From: rht Date: Sun, 15 Oct 2017 02:25:48 +0200 Subject: [PATCH] py3: Remove all `from __future__ import unicode_literals`. This was mostly used in migrations, so it's a pretty safe change. --- analytics/migrations/0001_initial.py | 2 -- analytics/migrations/0002_remove_huddlecount.py | 2 -- analytics/migrations/0003_fillstate.py | 2 -- analytics/migrations/0004_add_subgroup.py | 2 -- analytics/migrations/0005_alter_field_size.py | 2 -- analytics/migrations/0006_add_subgroup_to_unique_constraints.py | 2 -- analytics/migrations/0007_remove_interval.py | 2 -- analytics/migrations/0008_add_count_indexes.py | 2 -- confirmation/migrations/0001_initial.py | 2 -- confirmation/migrations/0002_realmcreationkey.py | 2 -- confirmation/migrations/0003_emailchangeconfirmation.py | 2 -- confirmation/migrations/0004_remove_confirmationmanager.py | 2 -- pgroonga/migrations/0001_enable.py | 2 -- zerver/migrations/0110_stream_is_in_zephyr_realm.py | 2 -- zilencer/migrations/0001_initial.py | 2 -- zilencer/migrations/0002_remote_zulip_server.py | 2 -- ...0003_add_default_for_remotezulipserver_last_updated_field.py | 2 -- zilencer/migrations/0004_remove_deployment_model.py | 2 -- 18 files changed, 36 deletions(-) diff --git a/analytics/migrations/0001_initial.py b/analytics/migrations/0001_initial.py index 0e037375e3..c30b4754d9 100644 --- a/analytics/migrations/0001_initial.py +++ b/analytics/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations import django.db.models.deletion from django.conf import settings diff --git a/analytics/migrations/0002_remove_huddlecount.py b/analytics/migrations/0002_remove_huddlecount.py index fa141b0e6f..c38d9ee44e 100644 --- a/analytics/migrations/0002_remove_huddlecount.py +++ b/analytics/migrations/0002_remove_huddlecount.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/analytics/migrations/0003_fillstate.py b/analytics/migrations/0003_fillstate.py index 336f3c8090..5e75edfd9a 100644 --- a/analytics/migrations/0003_fillstate.py +++ b/analytics/migrations/0003_fillstate.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import zerver.lib.str_utils diff --git a/analytics/migrations/0004_add_subgroup.py b/analytics/migrations/0004_add_subgroup.py index ce2f8531b0..e16e7733f0 100644 --- a/analytics/migrations/0004_add_subgroup.py +++ b/analytics/migrations/0004_add_subgroup.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/analytics/migrations/0005_alter_field_size.py b/analytics/migrations/0005_alter_field_size.py index 705862fdec..eed94b35db 100644 --- a/analytics/migrations/0005_alter_field_size.py +++ b/analytics/migrations/0005_alter_field_size.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/analytics/migrations/0006_add_subgroup_to_unique_constraints.py b/analytics/migrations/0006_add_subgroup_to_unique_constraints.py index 9898390ebb..ecb22060c8 100644 --- a/analytics/migrations/0006_add_subgroup_to_unique_constraints.py +++ b/analytics/migrations/0006_add_subgroup_to_unique_constraints.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/analytics/migrations/0007_remove_interval.py b/analytics/migrations/0007_remove_interval.py index dc5a687be0..0b9562c9bb 100644 --- a/analytics/migrations/0007_remove_interval.py +++ b/analytics/migrations/0007_remove_interval.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-16 20:50 -from __future__ import unicode_literals - from django.conf import settings from django.db import migrations diff --git a/analytics/migrations/0008_add_count_indexes.py b/analytics/migrations/0008_add_count_indexes.py index f28fdce1b8..7d95671840 100644 --- a/analytics/migrations/0008_add_count_indexes.py +++ b/analytics/migrations/0008_add_count_indexes.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-02-01 22:28 -from __future__ import unicode_literals - from django.db import migrations diff --git a/confirmation/migrations/0001_initial.py b/confirmation/migrations/0001_initial.py index 3298e64440..ca6d1951b4 100644 --- a/confirmation/migrations/0001_initial.py +++ b/confirmation/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations import django.db.models.deletion diff --git a/confirmation/migrations/0002_realmcreationkey.py b/confirmation/migrations/0002_realmcreationkey.py index fdebfdbb30..75d3b9d244 100644 --- a/confirmation/migrations/0002_realmcreationkey.py +++ b/confirmation/migrations/0002_realmcreationkey.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations import django.utils.timezone diff --git a/confirmation/migrations/0003_emailchangeconfirmation.py b/confirmation/migrations/0003_emailchangeconfirmation.py index cd7c126ab9..c64b3d6f67 100644 --- a/confirmation/migrations/0003_emailchangeconfirmation.py +++ b/confirmation/migrations/0003_emailchangeconfirmation.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.4 on 2017-01-17 09:16 -from __future__ import unicode_literals - from django.db import migrations diff --git a/confirmation/migrations/0004_remove_confirmationmanager.py b/confirmation/migrations/0004_remove_confirmationmanager.py index 62ed622ed2..06469ff52b 100644 --- a/confirmation/migrations/0004_remove_confirmationmanager.py +++ b/confirmation/migrations/0004_remove_confirmationmanager.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.2 on 2017-07-08 04:23 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/pgroonga/migrations/0001_enable.py b/pgroonga/migrations/0001_enable.py index cc008bec87..282db08732 100644 --- a/pgroonga/migrations/0001_enable.py +++ b/pgroonga/migrations/0001_enable.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations from django.contrib.postgres import operations from django.conf import settings diff --git a/zerver/migrations/0110_stream_is_in_zephyr_realm.py b/zerver/migrations/0110_stream_is_in_zephyr_realm.py index 254344f0c2..6bee548101 100644 --- a/zerver/migrations/0110_stream_is_in_zephyr_realm.py +++ b/zerver/migrations/0110_stream_is_in_zephyr_realm.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.5 on 2017-10-08 18:37 -from __future__ import unicode_literals - from django.db.backends.postgresql_psycopg2.schema import DatabaseSchemaEditor from django.db.migrations.state import StateApps from django.db import connection, migrations, models diff --git a/zilencer/migrations/0001_initial.py b/zilencer/migrations/0001_initial.py index a42b00cb26..d1b8229433 100644 --- a/zilencer/migrations/0001_initial.py +++ b/zilencer/migrations/0001_initial.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models, migrations diff --git a/zilencer/migrations/0002_remote_zulip_server.py b/zilencer/migrations/0002_remote_zulip_server.py index bff7e10a63..3302182512 100644 --- a/zilencer/migrations/0002_remote_zulip_server.py +++ b/zilencer/migrations/0002_remote_zulip_server.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import migrations, models import django.db.models.deletion diff --git a/zilencer/migrations/0003_add_default_for_remotezulipserver_last_updated_field.py b/zilencer/migrations/0003_add_default_for_remotezulipserver_last_updated_field.py index 216cd20927..8d96d6bab8 100644 --- a/zilencer/migrations/0003_add_default_for_remotezulipserver_last_updated_field.py +++ b/zilencer/migrations/0003_add_default_for_remotezulipserver_last_updated_field.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.10.5 on 2017-05-16 00:03 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/zilencer/migrations/0004_remove_deployment_model.py b/zilencer/migrations/0004_remove_deployment_model.py index eb40d378bf..90c5bccf89 100644 --- a/zilencer/migrations/0004_remove_deployment_model.py +++ b/zilencer/migrations/0004_remove_deployment_model.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.5 on 2017-10-12 06:27 -from __future__ import unicode_literals - from django.db import migrations