From 41622d45272e818e24855d4bfbcb66aa8f2994e3 Mon Sep 17 00:00:00 2001 From: Greg Taylor Date: Sat, 14 Sep 2019 12:02:23 -0700 Subject: [PATCH] Remove unneeded __futures__ imports No longer needed with Python 2 support dropped. --- bin/player-account-step1.patch | 5 ----- evennia/accounts/migrations/0008_auto_20190128_1820.py | 1 - evennia/comms/migrations/0017_auto_20190128_1820.py | 1 - evennia/help/migrations/0003_auto_20190128_1820.py | 2 -- evennia/objects/migrations/0010_auto_20190128_1820.py | 1 - evennia/scripts/migrations/0012_auto_20190128_1820.py | 1 - evennia/server/migrations/0002_auto_20190128_2311.py | 1 - evennia/typeclasses/migrations/0011_auto_20190128_1820.py | 1 - .../migrations/0012_attrs_to_picklev4_may_be_slow.py | 1 - 9 files changed, 14 deletions(-) diff --git a/bin/player-account-step1.patch b/bin/player-account-step1.patch index ede1d2e9b5..1f540c7c99 100644 --- a/bin/player-account-step1.patch +++ b/bin/player-account-step1.patch @@ -4,7 +4,6 @@ index ec5fc29..62b7936 100644 +++ b/evennia/comms/migrations/0015_auto_20170706_2041.py @@ -2,7 +2,12 @@ # Generated by Django 1.11.2 on 2017-07-06 20:41 - from __future__ import unicode_literals -from django.db import migrations +from django.db import migrations, connection @@ -60,7 +59,6 @@ index b27c75c..6e40252 100644 +++ b/evennia/objects/migrations/0007_objectdb_db_account.py @@ -2,21 +2,31 @@ # Generated by Django 1.11.2 on 2017-07-05 17:27 - from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations, models, connection @@ -104,7 +102,6 @@ index 80161a1..10fb225 100644 +++ b/evennia/objects/migrations/0009_remove_objectdb_db_player.py @@ -2,7 +2,12 @@ # Generated by Django 1.11.2 on 2017-07-06 20:41 - from __future__ import unicode_literals -from django.db import migrations +from django.db import migrations, connection @@ -144,7 +141,6 @@ index 99baf70..23f6df9 100644 +++ b/evennia/scripts/migrations/0009_scriptdb_db_account.py @@ -2,21 +2,31 @@ # Generated by Django 1.11.2 on 2017-07-05 17:27 - from __future__ import unicode_literals -from django.db import migrations, models +from django.db import migrations, models, connection @@ -188,7 +184,6 @@ index d3746a5..20fa63f 100644 +++ b/evennia/scripts/migrations/0011_remove_scriptdb_db_player.py @@ -2,7 +2,12 @@ # Generated by Django 1.11.2 on 2017-07-06 20:41 - from __future__ import unicode_literals -from django.db import migrations +from django.db import migrations, connection diff --git a/evennia/accounts/migrations/0008_auto_20190128_1820.py b/evennia/accounts/migrations/0008_auto_20190128_1820.py index dbef6f41fd..6ae6376197 100644 --- a/evennia/accounts/migrations/0008_auto_20190128_1820.py +++ b/evennia/accounts/migrations/0008_auto_20190128_1820.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-28 18:20 -from __future__ import unicode_literals import django.contrib.auth.validators from django.db import migrations, models diff --git a/evennia/comms/migrations/0017_auto_20190128_1820.py b/evennia/comms/migrations/0017_auto_20190128_1820.py index 3937ff9da0..d07f3cfb65 100644 --- a/evennia/comms/migrations/0017_auto_20190128_1820.py +++ b/evennia/comms/migrations/0017_auto_20190128_1820.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-28 18:20 -from __future__ import unicode_literals from django.conf import settings from django.db import migrations, models diff --git a/evennia/help/migrations/0003_auto_20190128_1820.py b/evennia/help/migrations/0003_auto_20190128_1820.py index 659ec951cb..d87067fd22 100644 --- a/evennia/help/migrations/0003_auto_20190128_1820.py +++ b/evennia/help/migrations/0003_auto_20190128_1820.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-28 18:20 -from __future__ import unicode_literals - from django.db import migrations, models diff --git a/evennia/objects/migrations/0010_auto_20190128_1820.py b/evennia/objects/migrations/0010_auto_20190128_1820.py index 3b23d72e58..fa161894cf 100644 --- a/evennia/objects/migrations/0010_auto_20190128_1820.py +++ b/evennia/objects/migrations/0010_auto_20190128_1820.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-28 18:20 -from __future__ import unicode_literals from django.conf import settings import django.core.validators diff --git a/evennia/scripts/migrations/0012_auto_20190128_1820.py b/evennia/scripts/migrations/0012_auto_20190128_1820.py index 6b1f71b159..80b3e3184e 100644 --- a/evennia/scripts/migrations/0012_auto_20190128_1820.py +++ b/evennia/scripts/migrations/0012_auto_20190128_1820.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-28 18:20 -from __future__ import unicode_literals from django.conf import settings from django.db import migrations, models diff --git a/evennia/server/migrations/0002_auto_20190128_2311.py b/evennia/server/migrations/0002_auto_20190128_2311.py index b6b8db0f55..5a3e46c009 100644 --- a/evennia/server/migrations/0002_auto_20190128_2311.py +++ b/evennia/server/migrations/0002_auto_20190128_2311.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-28 23:11 -from __future__ import unicode_literals from base64 import b64encode from django.db import migrations diff --git a/evennia/typeclasses/migrations/0011_auto_20190128_1820.py b/evennia/typeclasses/migrations/0011_auto_20190128_1820.py index 1d7bc4fb5d..d172e82124 100644 --- a/evennia/typeclasses/migrations/0011_auto_20190128_1820.py +++ b/evennia/typeclasses/migrations/0011_auto_20190128_1820.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-28 18:20 -from __future__ import unicode_literals from django.db import migrations, models import evennia.utils.picklefield diff --git a/evennia/typeclasses/migrations/0012_attrs_to_picklev4_may_be_slow.py b/evennia/typeclasses/migrations/0012_attrs_to_picklev4_may_be_slow.py index 2575ce064c..ed9de5ff2e 100644 --- a/evennia/typeclasses/migrations/0012_attrs_to_picklev4_may_be_slow.py +++ b/evennia/typeclasses/migrations/0012_attrs_to_picklev4_may_be_slow.py @@ -1,6 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2019-01-30 20:56 -from __future__ import unicode_literals from copy import deepcopy from base64 import b64encode, b64decode