From 4d14d1df92c074c31b4d754cbf509a3ea79f58b4 Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Tue, 6 Aug 2024 17:04:47 -0700 Subject: [PATCH 1/2] Remove unneeded future imports. --- kolibri/core/analytics/constants/nutrition_endpoints.py | 2 +- kolibri/core/analytics/middleware.py | 2 -- kolibri/core/analytics/migrations/0001_initial.py | 2 -- kolibri/core/analytics/models.py | 2 -- kolibri/core/apps.py | 2 -- kolibri/core/auth/constants/collection_kinds.py | 2 +- kolibri/core/auth/constants/demographics.py | 2 -- kolibri/core/auth/constants/facility_presets.py | 2 -- kolibri/core/auth/constants/morango_sync.py | 2 -- kolibri/core/auth/constants/role_kinds.py | 2 +- kolibri/core/auth/csv_utils.py | 2 -- kolibri/core/auth/migrations/0001_initial.py | 2 -- kolibri/core/auth/migrations/0002_auto_20170608_2125.py | 2 -- kolibri/core/auth/migrations/0003_auto_20170621_0958.py | 2 -- kolibri/core/auth/migrations/0004_auto_20170816_1607.py | 2 -- kolibri/core/auth/migrations/0005_auto_20170818_1203.py | 2 -- kolibri/core/auth/migrations/0006_auto_20171206_1207.py | 2 -- kolibri/core/auth/migrations/0007_auto_20171226_1125.py | 2 -- kolibri/core/auth/migrations/0008_auto_20180222_1244.py | 2 -- kolibri/core/auth/migrations/0009_auto_20180301_1123.py | 2 -- kolibri/core/auth/migrations/0010_auto_20180320_1320.py | 2 -- .../0011_facilitydataset_show_download_button_in_learn.py | 2 -- .../migrations/0012_facilitydataset_allow_guest_access.py | 2 -- kolibri/core/auth/migrations/0013_auto_20180917_1213.py | 2 -- kolibri/core/auth/migrations/0014_auto_20190815_1421.py | 2 -- .../core/auth/migrations/0015_facilitydataset_registered.py | 2 -- .../0016_add_adhoclearnersgroup_collection_kind.py | 2 -- .../0017_remove_facilitydataset_allow_guest_access.py | 2 -- .../core/auth/migrations/0018_no_i18n_collection_kinds.py | 2 -- kolibri/core/auth/migrations/0019_collection_no_mptt.py | 2 -- .../auth/migrations/0020_facilitydataset_extra_fields.py | 2 -- .../0021_facilitydataset_extra_fields_validations.py | 2 -- ...0022_facilitydataset_extra_fields_update_pin_to_string.py | 2 -- .../auth/migrations/0023_change_extra_fields_validator.py | 2 -- kolibri/core/auth/migrations/0024_extend_username_length.py | 2 -- .../core/auth/migrations/0025_custom_demographic_schema.py | 2 -- .../auth/migrations/0026_update_language_code_nyn_to_ny.py | 2 -- kolibri/core/auth/test/sync_utils.py | 2 -- kolibri/core/auth/test/test_session_middleware.py | 2 -- kolibri/core/bookmarks/migrations/0001_initial.py | 2 -- kolibri/core/bookmarks/migrations/0002_bookmark_created.py | 2 -- kolibri/core/bookmarks/models.py | 2 -- kolibri/core/content/base_models.py | 2 -- kolibri/core/content/migrations/0001_initial.py | 2 -- .../migrations/0002_channelmetadatacache_last_updated.py | 2 -- kolibri/core/content/migrations/0003_auto_20170607_1212.py | 2 -- kolibri/core/content/migrations/0004_auto_20170825_1038.py | 2 -- kolibri/core/content/migrations/0005_auto_20171009_0903.py | 2 -- kolibri/core/content/migrations/0006_auto_20171128_1703.py | 2 -- kolibri/core/content/migrations/0007_auto_20180212_1155.py | 2 -- kolibri/core/content/migrations/0008_auto_20180429_1709.py | 2 -- .../content/migrations/0008_contentnode_coach_content.py | 2 -- kolibri/core/content/migrations/0009_auto_20180410_1139.py | 2 -- kolibri/core/content/migrations/0010_merge_20180504_1540.py | 2 -- kolibri/core/content/migrations/0011_auto_20180907_1017.py | 2 -- kolibri/core/content/migrations/0012_auto_20180910_1702.py | 2 -- kolibri/core/content/migrations/0013_auto_20180919_1142.py | 2 -- kolibri/core/content/migrations/0014_auto_20181218_1132.py | 2 -- kolibri/core/content/migrations/0015_auto_20190125_1715.py | 2 -- kolibri/core/content/migrations/0016_auto_20190124_1639.py | 2 -- kolibri/core/content/migrations/0017_auto_20190415_1855.py | 2 -- .../migrations/0018_contentnode_num_coach_contents.py | 2 -- .../content/migrations/0019_contentnode_slideshow_options.py | 2 -- .../migrations/0020_le_utils_0_20_upgrade_migration.py | 2 -- .../migrations/0021_remove_contentnode_stemmed_metaphone.py | 2 -- .../core/content/migrations/0022_remove_file_available.py | 2 -- .../migrations/0023_contentnode_on_device_resources.py | 2 -- .../core/content/migrations/0024_channelmetadata_public.py | 2 -- kolibri/core/content/migrations/0025_add_h5p_kind.py | 2 -- kolibri/core/content/migrations/0026_contentnode_options.py | 2 -- .../core/content/migrations/0027_channelmetadata_tagline.py | 2 -- .../content/migrations/0028_contentnode_metadata_labels.py | 2 -- kolibri/core/content/migrations/0029_metadata_bitmasks.py | 2 -- .../core/content/migrations/0030_contentnode_ancestors.py | 2 -- .../core/content/migrations/0031_channelmetadata_partial.py | 2 -- .../content/migrations/0032_contentnode_admin_imported.py | 2 -- kolibri/core/content/migrations/0033_content_requests.py | 2 -- .../migrations/0034_contentrequest_source_instance_id.py | 2 -- kolibri/core/content/migrations/0035_add_imscp_preset.py | 2 -- kolibri/core/content/models.py | 2 -- kolibri/core/device/migrations/0001_initial.py | 2 -- .../migrations/0002_devicesettings_default_facility.py | 2 -- kolibri/core/device/migrations/0003_contentcachekey.py | 2 -- kolibri/core/device/migrations/0004_auto_20190306_0553.py | 2 -- kolibri/core/device/migrations/0005_auto_20191203_0951.py | 2 -- kolibri/core/device/migrations/0006_migrate_guest_access.py | 2 -- kolibri/core/device/migrations/0007_deviceappkey.py | 2 -- kolibri/core/device/migrations/0007_devicesettings_name.py | 2 -- .../0008_devicesettings_allow_other_browsers_to_connect.py | 2 -- kolibri/core/device/migrations/0008_merge_20200531_1829.py | 2 -- kolibri/core/device/migrations/0009_merge_20200608_1716.py | 2 -- kolibri/core/device/migrations/0010_sqlitelock.py | 2 -- .../migrations/0011_devicesettings_subset_of_users_device.py | 2 -- kolibri/core/device/migrations/0012_syncqueue.py | 2 -- kolibri/core/device/migrations/0013_usersyncstatus.py | 2 -- kolibri/core/device/migrations/0014_syncqueue_instance_id.py | 2 -- kolibri/core/device/migrations/0015_syncqueue_no_fk.py | 2 -- kolibri/core/device/migrations/0016_osuser.py | 2 -- kolibri/core/device/migrations/0017_extra_settings.py | 2 -- .../core/device/migrations/0018_add_learner_device_status.py | 2 -- kolibri/core/device/migrations/0019_syncqueue_and_status.py | 2 -- .../migrations/0020_fix_learner_device_status_choices.py | 2 -- .../device/migrations/0021_default_demographic_fields.py | 2 -- .../device/migrations/0022_update_language_code_nyn_to_ny.py | 2 -- .../0023_learner_device_status_multiple_devices.py | 2 -- kolibri/core/device/test/locale_middleware_urls.py | 2 -- kolibri/core/device/test/prefixed_locale_middleware_urls.py | 2 -- kolibri/core/device/test/test_locale_middleware.py | 2 -- kolibri/core/device/translation.py | 2 -- kolibri/core/discovery/migrations/0001_initial.py | 2 -- .../0002_general_network_location_data_structure.py | 2 -- .../0003_networklocation_subset_of_users_device.py | 2 -- kolibri/core/discovery/migrations/0004_str_default_id.py | 2 -- .../migrations/0005_add_connection_tracking_metadata.py | 2 -- .../0006_networklocation_min_content_schema_version.py | 2 -- kolibri/core/discovery/migrations/0007_device_pinning.py | 2 -- .../discovery/migrations/0008_networklocation_is_local.py | 2 -- kolibri/core/discovery/migrations/0009_add_location_type.py | 2 -- kolibri/core/discovery/migrations/0010_set_location_type.py | 2 -- .../migrations/0011_remove_networklocation_dynamic.py | 2 -- .../core/discovery/migrations/0012_remove_pinned_device.py | 2 -- .../core/discovery/migrations/0013_recreate_pinned_device.py | 2 -- kolibri/core/exams/migrations/0001_initial.py | 2 -- kolibri/core/exams/migrations/0002_update_exam_data_model.py | 2 -- kolibri/core/exams/migrations/0003_auto_20190426_1015.py | 2 -- .../0004_exam_add_dates_opened_created_and_archived.py | 2 -- kolibri/core/exams/migrations/0005_individualsyncableexam.py | 2 -- .../exams/migrations/0006_nullable_creator_assigned_by.py | 2 -- .../exams/migrations/0007_bump_data_model_version_to_3.py | 2 -- kolibri/core/lessons/migrations/0001_initial.py | 2 -- kolibri/core/lessons/migrations/0002_auto_20180221_1115.py | 2 -- .../core/lessons/migrations/0003_individualsyncablelesson.py | 2 -- .../migrations/0004_nullable_created_by_assigned_by.py | 2 -- kolibri/core/lessons/models.py | 2 -- kolibri/core/logger/csv_export.py | 2 -- kolibri/core/logger/migrations/0001_initial.py | 2 -- kolibri/core/logger/migrations/0002_auto_20170518_1031.py | 2 -- kolibri/core/logger/migrations/0003_auto_20170531_1140.py | 2 -- kolibri/core/logger/migrations/0004_tidy_progress_range.py | 2 -- kolibri/core/logger/migrations/0005_auto_20180514_1419.py | 2 -- .../migrations/0006_remove_examattemptlog_channel_id.py | 2 -- .../logger/migrations/0007_contentsessionlog_visitor_id.py | 2 -- .../logger/migrations/0008_usersessionlog_device_info.py | 2 -- .../0009_null_channel_id_unconstrained_mastery_level.py | 2 -- kolibri/core/logger/migrations/0010_min_length_validation.py | 2 -- kolibri/core/logger/migrations/0011_masterylog_time_spent.py | 2 -- kolibri/core/logger/migrations/0012_generatecsvlogrequest.py | 2 -- .../0013_generatecsvlogrequest_allow_null_timestamps.py | 2 -- kolibri/core/logger/models.py | 2 -- kolibri/core/notifications/migrations/0001_initial.py | 2 -- .../core/notifications/migrations/0002_notificationslog.py | 2 -- .../0003_learnerprogressnotification_quiz_num_correct.py | 2 -- .../0004_learnerprogressnotification_quiz_num_answered.py | 2 -- ...005_learnerprogressnotification_assignment_collections.py | 2 -- kolibri/core/notifications/migrations/0006_fix_choices.py | 2 -- kolibri/core/notifications/models.py | 2 -- kolibri/core/notifications/utils.py | 2 -- kolibri/core/public/constants/user_sync_options.py | 2 +- kolibri/core/public/constants/user_sync_statuses.py | 1 - kolibri/core/routers.py | 3 --- kolibri/core/test/test_drf_mixins.py | 3 --- kolibri/core/utils/csv.py | 2 -- kolibri/utils/constants/installation_types.py | 2 +- kolibri/utils/pskolibri/__init__.py | 3 --- kolibri/utils/pskolibri/_pslinux.py | 3 --- kolibri/utils/pskolibri/_psosx.py | 2 -- kolibri/utils/pskolibri/_pswindows.py | 3 --- kolibri/utils/pskolibri/common.py | 3 --- kolibri/utils/tests/test_cli.py | 3 --- kolibri/utils/tests/test_main.py | 3 --- kolibri/utils/version.py | 5 ----- packages/kolibri-tools/lib/i18n/fonts.py | 2 -- test/test_cli_at_import.py | 3 --- 173 files changed, 5 insertions(+), 352 deletions(-) diff --git a/kolibri/core/analytics/constants/nutrition_endpoints.py b/kolibri/core/analytics/constants/nutrition_endpoints.py index 34d38908d16..fa040f12664 100644 --- a/kolibri/core/analytics/constants/nutrition_endpoints.py +++ b/kolibri/core/analytics/constants/nutrition_endpoints.py @@ -2,7 +2,7 @@ This module contains constants which represent what nutrition fact endpoints notifications are returned from. """ -from __future__ import unicode_literals + PINGBACK = "pingback" STATISTICS = "statistics" diff --git a/kolibri/core/analytics/middleware.py b/kolibri/core/analytics/middleware.py index 443c11813a9..81a9a9b4944 100644 --- a/kolibri/core/analytics/middleware.py +++ b/kolibri/core/analytics/middleware.py @@ -1,5 +1,3 @@ -from __future__ import absolute_import - import csv import logging import os diff --git a/kolibri/core/analytics/migrations/0001_initial.py b/kolibri/core/analytics/migrations/0001_initial.py index 4b62c4f2628..8ec4d4faab0 100644 --- a/kolibri/core/analytics/migrations/0001_initial.py +++ b/kolibri/core/analytics/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-01-18 17:18 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations from django.db import models diff --git a/kolibri/core/analytics/models.py b/kolibri/core/analytics/models.py index cf89efff529..aff57645738 100644 --- a/kolibri/core/analytics/models.py +++ b/kolibri/core/analytics/models.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models from .constants import nutrition_endpoints diff --git a/kolibri/core/apps.py b/kolibri/core/apps.py index f9cd1eff75b..7c16ed7f0ae 100644 --- a/kolibri/core/apps.py +++ b/kolibri/core/apps.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import logging import os diff --git a/kolibri/core/auth/constants/collection_kinds.py b/kolibri/core/auth/constants/collection_kinds.py index 735ab40eea7..768f6024f41 100644 --- a/kolibri/core/auth/constants/collection_kinds.py +++ b/kolibri/core/auth/constants/collection_kinds.py @@ -1,7 +1,7 @@ """ This module contains constants representing the kinds of Collections. """ -from __future__ import unicode_literals + FACILITY = "facility" CLASSROOM = "classroom" diff --git a/kolibri/core/auth/constants/demographics.py b/kolibri/core/auth/constants/demographics.py index 094b942361e..fb37952deb1 100644 --- a/kolibri/core/auth/constants/demographics.py +++ b/kolibri/core/auth/constants/demographics.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.core.exceptions import ValidationError from django.utils.deconstruct import deconstructible diff --git a/kolibri/core/auth/constants/facility_presets.py b/kolibri/core/auth/constants/facility_presets.py index 6edfc82435b..f0d826ad370 100644 --- a/kolibri/core/auth/constants/facility_presets.py +++ b/kolibri/core/auth/constants/facility_presets.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import io import json import os diff --git a/kolibri/core/auth/constants/morango_sync.py b/kolibri/core/auth/constants/morango_sync.py index eb42e5484ac..7ea7aeeb733 100644 --- a/kolibri/core/auth/constants/morango_sync.py +++ b/kolibri/core/auth/constants/morango_sync.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from kolibri import __version__ from kolibri.utils import conf diff --git a/kolibri/core/auth/constants/role_kinds.py b/kolibri/core/auth/constants/role_kinds.py index 2848233b4e0..c9d1915943a 100644 --- a/kolibri/core/auth/constants/role_kinds.py +++ b/kolibri/core/auth/constants/role_kinds.py @@ -1,7 +1,7 @@ """ This module contains constants representing the kinds of "roles" that a user can have with respect to a Collection. """ -from __future__ import unicode_literals + ADMIN = "admin" COACH = "coach" diff --git a/kolibri/core/auth/csv_utils.py b/kolibri/core/auth/csv_utils.py index 89f8e84042e..3a1dc8c8edf 100644 --- a/kolibri/core/auth/csv_utils.py +++ b/kolibri/core/auth/csv_utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import csv import logging import os diff --git a/kolibri/core/auth/migrations/0001_initial.py b/kolibri/core/auth/migrations/0001_initial.py index 686e4878e78..477573fd9d2 100644 --- a/kolibri/core/auth/migrations/0001_initial.py +++ b/kolibri/core/auth/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-05-14 05:22 -from __future__ import unicode_literals - import uuid import django.core.validators diff --git a/kolibri/core/auth/migrations/0002_auto_20170608_2125.py b/kolibri/core/auth/migrations/0002_auto_20170608_2125.py index fb85efaea12..82f91c40766 100644 --- a/kolibri/core/auth/migrations/0002_auto_20170608_2125.py +++ b/kolibri/core/auth/migrations/0002_auto_20170608_2125.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-06-08 21:25 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0003_auto_20170621_0958.py b/kolibri/core/auth/migrations/0003_auto_20170621_0958.py index 0a68f2a6c11..7f46d5757b5 100644 --- a/kolibri/core/auth/migrations/0003_auto_20170621_0958.py +++ b/kolibri/core/auth/migrations/0003_auto_20170621_0958.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-06-21 16:58 -from __future__ import unicode_literals - from functools import partial from django.db import migrations diff --git a/kolibri/core/auth/migrations/0004_auto_20170816_1607.py b/kolibri/core/auth/migrations/0004_auto_20170816_1607.py index 0e817549123..a9c1274d493 100644 --- a/kolibri/core/auth/migrations/0004_auto_20170816_1607.py +++ b/kolibri/core/auth/migrations/0004_auto_20170816_1607.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-08-16 23:07 -from __future__ import unicode_literals - from django.db import migrations from kolibri.core.auth.constants.role_kinds import ADMIN diff --git a/kolibri/core/auth/migrations/0005_auto_20170818_1203.py b/kolibri/core/auth/migrations/0005_auto_20170818_1203.py index 973bef88d63..6c11541355e 100644 --- a/kolibri/core/auth/migrations/0005_auto_20170818_1203.py +++ b/kolibri/core/auth/migrations/0005_auto_20170818_1203.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-08-18 19:03 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0006_auto_20171206_1207.py b/kolibri/core/auth/migrations/0006_auto_20171206_1207.py index 15572aaf320..1124f5593c2 100644 --- a/kolibri/core/auth/migrations/0006_auto_20171206_1207.py +++ b/kolibri/core/auth/migrations/0006_auto_20171206_1207.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-12-06 20:07 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0007_auto_20171226_1125.py b/kolibri/core/auth/migrations/0007_auto_20171226_1125.py index 5c12666d40e..7e5f52f9e22 100644 --- a/kolibri/core/auth/migrations/0007_auto_20171226_1125.py +++ b/kolibri/core/auth/migrations/0007_auto_20171226_1125.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.13 on 2017-12-26 19:25 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0008_auto_20180222_1244.py b/kolibri/core/auth/migrations/0008_auto_20180222_1244.py index e77f642cf9f..b8c305a27c7 100644 --- a/kolibri/core/auth/migrations/0008_auto_20180222_1244.py +++ b/kolibri/core/auth/migrations/0008_auto_20180222_1244.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.13 on 2018-02-22 20:44 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.auth.models diff --git a/kolibri/core/auth/migrations/0009_auto_20180301_1123.py b/kolibri/core/auth/migrations/0009_auto_20180301_1123.py index 2fe125e2294..be0cc2ab3c6 100644 --- a/kolibri/core/auth/migrations/0009_auto_20180301_1123.py +++ b/kolibri/core/auth/migrations/0009_auto_20180301_1123.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-03-01 19:23 -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/kolibri/core/auth/migrations/0010_auto_20180320_1320.py b/kolibri/core/auth/migrations/0010_auto_20180320_1320.py index c88b3b08ec6..49ab5a90f10 100644 --- a/kolibri/core/auth/migrations/0010_auto_20180320_1320.py +++ b/kolibri/core/auth/migrations/0010_auto_20180320_1320.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-03-20 20:20 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0011_facilitydataset_show_download_button_in_learn.py b/kolibri/core/auth/migrations/0011_facilitydataset_show_download_button_in_learn.py index 63d7a593c17..678b81751c8 100644 --- a/kolibri/core/auth/migrations/0011_facilitydataset_show_download_button_in_learn.py +++ b/kolibri/core/auth/migrations/0011_facilitydataset_show_download_button_in_learn.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-03-23 23:56 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0012_facilitydataset_allow_guest_access.py b/kolibri/core/auth/migrations/0012_facilitydataset_allow_guest_access.py index 002bdb62759..e76f896405d 100644 --- a/kolibri/core/auth/migrations/0012_facilitydataset_allow_guest_access.py +++ b/kolibri/core/auth/migrations/0012_facilitydataset_allow_guest_access.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-07-24 17:48 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0013_auto_20180917_1213.py b/kolibri/core/auth/migrations/0013_auto_20180917_1213.py index 9305cf9dff5..52100f0d7c4 100644 --- a/kolibri/core/auth/migrations/0013_auto_20180917_1213.py +++ b/kolibri/core/auth/migrations/0013_auto_20180917_1213.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-17 16:13 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0014_auto_20190815_1421.py b/kolibri/core/auth/migrations/0014_auto_20190815_1421.py index 6e2527aedc6..883f0d62f04 100644 --- a/kolibri/core/auth/migrations/0014_auto_20190815_1421.py +++ b/kolibri/core/auth/migrations/0014_auto_20190815_1421.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.22 on 2019-08-15 21:21 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0015_facilitydataset_registered.py b/kolibri/core/auth/migrations/0015_facilitydataset_registered.py index 169a9afb687..1cc8a9ac298 100644 --- a/kolibri/core/auth/migrations/0015_facilitydataset_registered.py +++ b/kolibri/core/auth/migrations/0015_facilitydataset_registered.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-11-05 17:13 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0016_add_adhoclearnersgroup_collection_kind.py b/kolibri/core/auth/migrations/0016_add_adhoclearnersgroup_collection_kind.py index 4b45423729a..db2ff458734 100644 --- a/kolibri/core/auth/migrations/0016_add_adhoclearnersgroup_collection_kind.py +++ b/kolibri/core/auth/migrations/0016_add_adhoclearnersgroup_collection_kind.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-12-09 12:34 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0017_remove_facilitydataset_allow_guest_access.py b/kolibri/core/auth/migrations/0017_remove_facilitydataset_allow_guest_access.py index 290e5a7f5c0..45a28d02b70 100644 --- a/kolibri/core/auth/migrations/0017_remove_facilitydataset_allow_guest_access.py +++ b/kolibri/core/auth/migrations/0017_remove_facilitydataset_allow_guest_access.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-12-03 18:17 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/auth/migrations/0018_no_i18n_collection_kinds.py b/kolibri/core/auth/migrations/0018_no_i18n_collection_kinds.py index 7f638ba87ca..8c44e454af6 100644 --- a/kolibri/core/auth/migrations/0018_no_i18n_collection_kinds.py +++ b/kolibri/core/auth/migrations/0018_no_i18n_collection_kinds.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-06-22 15:50 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0019_collection_no_mptt.py b/kolibri/core/auth/migrations/0019_collection_no_mptt.py index 6e76b18dbd1..475a323666f 100644 --- a/kolibri/core/auth/migrations/0019_collection_no_mptt.py +++ b/kolibri/core/auth/migrations/0019_collection_no_mptt.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-05-01 16:46 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0020_facilitydataset_extra_fields.py b/kolibri/core/auth/migrations/0020_facilitydataset_extra_fields.py index 96cbf927f1d..86b112ef28c 100644 --- a/kolibri/core/auth/migrations/0020_facilitydataset_extra_fields.py +++ b/kolibri/core/auth/migrations/0020_facilitydataset_extra_fields.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2022-07-25 09:14 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/auth/migrations/0021_facilitydataset_extra_fields_validations.py b/kolibri/core/auth/migrations/0021_facilitydataset_extra_fields_validations.py index 51d23e2dbe1..fac659f9f39 100644 --- a/kolibri/core/auth/migrations/0021_facilitydataset_extra_fields_validations.py +++ b/kolibri/core/auth/migrations/0021_facilitydataset_extra_fields_validations.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-01-31 18:19 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/auth/migrations/0022_facilitydataset_extra_fields_update_pin_to_string.py b/kolibri/core/auth/migrations/0022_facilitydataset_extra_fields_update_pin_to_string.py index c87d21c517e..85b6bb0ebca 100644 --- a/kolibri/core/auth/migrations/0022_facilitydataset_extra_fields_update_pin_to_string.py +++ b/kolibri/core/auth/migrations/0022_facilitydataset_extra_fields_update_pin_to_string.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-02-02 21:21 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/auth/migrations/0023_change_extra_fields_validator.py b/kolibri/core/auth/migrations/0023_change_extra_fields_validator.py index 0be56e26deb..f4c4ac76bfa 100644 --- a/kolibri/core/auth/migrations/0023_change_extra_fields_validator.py +++ b/kolibri/core/auth/migrations/0023_change_extra_fields_validator.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-03-07 20:46 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/auth/migrations/0024_extend_username_length.py b/kolibri/core/auth/migrations/0024_extend_username_length.py index 86efcc629aa..10bdf43ea9a 100644 --- a/kolibri/core/auth/migrations/0024_extend_username_length.py +++ b/kolibri/core/auth/migrations/0024_extend_username_length.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-10-17 17:51 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/auth/migrations/0025_custom_demographic_schema.py b/kolibri/core/auth/migrations/0025_custom_demographic_schema.py index c60cc06a53d..95217564664 100644 --- a/kolibri/core/auth/migrations/0025_custom_demographic_schema.py +++ b/kolibri/core/auth/migrations/0025_custom_demographic_schema.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2024-03-28 15:34 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.auth.constants.demographics diff --git a/kolibri/core/auth/migrations/0026_update_language_code_nyn_to_ny.py b/kolibri/core/auth/migrations/0026_update_language_code_nyn_to_ny.py index e5b7c63fbab..7128caabd48 100644 --- a/kolibri/core/auth/migrations/0026_update_language_code_nyn_to_ny.py +++ b/kolibri/core/auth/migrations/0026_update_language_code_nyn_to_ny.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2024-05-10 21:02 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.auth.constants.demographics diff --git a/kolibri/core/auth/test/sync_utils.py b/kolibri/core/auth/test/sync_utils.py index 1d13aac66f6..16d696fe4d1 100644 --- a/kolibri/core/auth/test/sync_utils.py +++ b/kolibri/core/auth/test/sync_utils.py @@ -1,5 +1,3 @@ -from __future__ import with_statement - import json import os import shutil diff --git a/kolibri/core/auth/test/test_session_middleware.py b/kolibri/core/auth/test/test_session_middleware.py index 254a9cf309f..4673644f82e 100644 --- a/kolibri/core/auth/test/test_session_middleware.py +++ b/kolibri/core/auth/test/test_session_middleware.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.http import HttpRequest from django.http import HttpResponse from django.test import SimpleTestCase diff --git a/kolibri/core/bookmarks/migrations/0001_initial.py b/kolibri/core/bookmarks/migrations/0001_initial.py index 161e23f2067..7435bf00e7d 100644 --- a/kolibri/core/bookmarks/migrations/0001_initial.py +++ b/kolibri/core/bookmarks/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-05-27 19:59 -from __future__ import unicode_literals - import django.db.models.deletion import morango.models.fields.uuids from django.conf import settings diff --git a/kolibri/core/bookmarks/migrations/0002_bookmark_created.py b/kolibri/core/bookmarks/migrations/0002_bookmark_created.py index ba3b41dd2e1..1fbac44a2e2 100644 --- a/kolibri/core/bookmarks/migrations/0002_bookmark_created.py +++ b/kolibri/core/bookmarks/migrations/0002_bookmark_created.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-09-14 00:24 -from __future__ import unicode_literals - import django.utils.timezone from django.db import migrations from django.db import models diff --git a/kolibri/core/bookmarks/models.py b/kolibri/core/bookmarks/models.py index 460a26f77f1..1e3d49d8469 100644 --- a/kolibri/core/bookmarks/models.py +++ b/kolibri/core/bookmarks/models.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.db import models from django.utils import timezone from morango.models import UUIDField diff --git a/kolibri/core/content/base_models.py b/kolibri/core/content/base_models.py index d8c326a66fd..612ab5391e1 100644 --- a/kolibri/core/content/base_models.py +++ b/kolibri/core/content/base_models.py @@ -65,8 +65,6 @@ If fields are being removed or entire models deleted from this file, they should be copied into legacy_models.py to allow for referencing during channel import of older databases. """ -from __future__ import print_function - from django.db import models from le_utils.constants import content_kinds from le_utils.constants import file_formats diff --git a/kolibri/core/content/migrations/0001_initial.py b/kolibri/core/content/migrations/0001_initial.py index 06912a0f782..49d4f2f216c 100644 --- a/kolibri/core/content/migrations/0001_initial.py +++ b/kolibri/core/content/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-05-16 22:32 -from __future__ import unicode_literals - import morango.models from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0002_channelmetadatacache_last_updated.py b/kolibri/core/content/migrations/0002_channelmetadatacache_last_updated.py index 179676b0d87..bb6793ffa93 100644 --- a/kolibri/core/content/migrations/0002_channelmetadatacache_last_updated.py +++ b/kolibri/core/content/migrations/0002_channelmetadatacache_last_updated.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-06-06 17:16 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/content/migrations/0003_auto_20170607_1212.py b/kolibri/core/content/migrations/0003_auto_20170607_1212.py index b33d4a08855..afee8d2dee8 100644 --- a/kolibri/core/content/migrations/0003_auto_20170607_1212.py +++ b/kolibri/core/content/migrations/0003_auto_20170607_1212.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-06-07 19:12 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/content/migrations/0004_auto_20170825_1038.py b/kolibri/core/content/migrations/0004_auto_20170825_1038.py index b2122127da8..996312da896 100644 --- a/kolibri/core/content/migrations/0004_auto_20170825_1038.py +++ b/kolibri/core/content/migrations/0004_auto_20170825_1038.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-08-25 17:38 -from __future__ import unicode_literals - import django.db.models.deletion import django.db.models.manager import morango.models diff --git a/kolibri/core/content/migrations/0005_auto_20171009_0903.py b/kolibri/core/content/migrations/0005_auto_20171009_0903.py index 5d27cf2265c..8b2a2708db4 100644 --- a/kolibri/core/content/migrations/0005_auto_20171009_0903.py +++ b/kolibri/core/content/migrations/0005_auto_20171009_0903.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-10-09 16:03 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0006_auto_20171128_1703.py b/kolibri/core/content/migrations/0006_auto_20171128_1703.py index e28f19f6422..67ab2a99663 100644 --- a/kolibri/core/content/migrations/0006_auto_20171128_1703.py +++ b/kolibri/core/content/migrations/0006_auto_20171128_1703.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.13 on 2017-11-29 01:03 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/content/migrations/0007_auto_20180212_1155.py b/kolibri/core/content/migrations/0007_auto_20180212_1155.py index 42ca1457392..49206fc9ea3 100644 --- a/kolibri/core/content/migrations/0007_auto_20180212_1155.py +++ b/kolibri/core/content/migrations/0007_auto_20180212_1155.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.8 on 2018-02-12 19:55 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/content/migrations/0008_auto_20180429_1709.py b/kolibri/core/content/migrations/0008_auto_20180429_1709.py index 85afbdcf32f..42fb98077f4 100644 --- a/kolibri/core/content/migrations/0008_auto_20180429_1709.py +++ b/kolibri/core/content/migrations/0008_auto_20180429_1709.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-04-30 00:09 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0008_contentnode_coach_content.py b/kolibri/core/content/migrations/0008_contentnode_coach_content.py index 2bea27cda39..c74cb46fd48 100644 --- a/kolibri/core/content/migrations/0008_contentnode_coach_content.py +++ b/kolibri/core/content/migrations/0008_contentnode_coach_content.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-03-28 19:08 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0009_auto_20180410_1139.py b/kolibri/core/content/migrations/0009_auto_20180410_1139.py index a3578b08b5a..6f5ea474926 100644 --- a/kolibri/core/content/migrations/0009_auto_20180410_1139.py +++ b/kolibri/core/content/migrations/0009_auto_20180410_1139.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-04-10 18:39 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0010_merge_20180504_1540.py b/kolibri/core/content/migrations/0010_merge_20180504_1540.py index d851d061837..6e66fa4015e 100644 --- a/kolibri/core/content/migrations/0010_merge_20180504_1540.py +++ b/kolibri/core/content/migrations/0010_merge_20180504_1540.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.11 on 2018-05-04 22:40 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/content/migrations/0011_auto_20180907_1017.py b/kolibri/core/content/migrations/0011_auto_20180907_1017.py index 0f3bb58d924..762e888ebb8 100644 --- a/kolibri/core/content/migrations/0011_auto_20180907_1017.py +++ b/kolibri/core/content/migrations/0011_auto_20180907_1017.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-05 20:52 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0012_auto_20180910_1702.py b/kolibri/core/content/migrations/0012_auto_20180910_1702.py index 92e7bb08449..9afd666daf5 100644 --- a/kolibri/core/content/migrations/0012_auto_20180910_1702.py +++ b/kolibri/core/content/migrations/0012_auto_20180910_1702.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-11 00:02 -from __future__ import unicode_literals - from django.db import migrations from django.db.models import Sum from le_utils.constants import content_kinds diff --git a/kolibri/core/content/migrations/0013_auto_20180919_1142.py b/kolibri/core/content/migrations/0013_auto_20180919_1142.py index de0f98744da..be5af20b775 100644 --- a/kolibri/core/content/migrations/0013_auto_20180919_1142.py +++ b/kolibri/core/content/migrations/0013_auto_20180919_1142.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-19 18:42 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0014_auto_20181218_1132.py b/kolibri/core/content/migrations/0014_auto_20181218_1132.py index b77939c6e2d..78c7520b6fa 100644 --- a/kolibri/core/content/migrations/0014_auto_20181218_1132.py +++ b/kolibri/core/content/migrations/0014_auto_20181218_1132.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-12-18 19:32 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0015_auto_20190125_1715.py b/kolibri/core/content/migrations/0015_auto_20190125_1715.py index 35f2e3002e2..570a872f1eb 100644 --- a/kolibri/core/content/migrations/0015_auto_20190125_1715.py +++ b/kolibri/core/content/migrations/0015_auto_20190125_1715.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-01-26 01:15 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0016_auto_20190124_1639.py b/kolibri/core/content/migrations/0016_auto_20190124_1639.py index 3f8534d5b33..4d32f16b7c8 100644 --- a/kolibri/core/content/migrations/0016_auto_20190124_1639.py +++ b/kolibri/core/content/migrations/0016_auto_20190124_1639.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-01-25 00:39 -from __future__ import unicode_literals - from django.db import migrations from kolibri.core.content.utils.annotation import calculate_next_order diff --git a/kolibri/core/content/migrations/0017_auto_20190415_1855.py b/kolibri/core/content/migrations/0017_auto_20190415_1855.py index 684951e0c62..86688b6a82d 100644 --- a/kolibri/core/content/migrations/0017_auto_20190415_1855.py +++ b/kolibri/core/content/migrations/0017_auto_20190415_1855.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-15 10:55 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0018_contentnode_num_coach_contents.py b/kolibri/core/content/migrations/0018_contentnode_num_coach_contents.py index 4f38a353969..9802a052d79 100644 --- a/kolibri/core/content/migrations/0018_contentnode_num_coach_contents.py +++ b/kolibri/core/content/migrations/0018_contentnode_num_coach_contents.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-16 15:19 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0019_contentnode_slideshow_options.py b/kolibri/core/content/migrations/0019_contentnode_slideshow_options.py index 2c64baea366..e5017deca91 100644 --- a/kolibri/core/content/migrations/0019_contentnode_slideshow_options.py +++ b/kolibri/core/content/migrations/0019_contentnode_slideshow_options.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.21 on 2019-07-16 20:24 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0020_le_utils_0_20_upgrade_migration.py b/kolibri/core/content/migrations/0020_le_utils_0_20_upgrade_migration.py index 2fd77268622..bf88573183b 100644 --- a/kolibri/core/content/migrations/0020_le_utils_0_20_upgrade_migration.py +++ b/kolibri/core/content/migrations/0020_le_utils_0_20_upgrade_migration.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-08-22 17:32 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0021_remove_contentnode_stemmed_metaphone.py b/kolibri/core/content/migrations/0021_remove_contentnode_stemmed_metaphone.py index ba53793b58d..a7a1bfcd16a 100644 --- a/kolibri/core/content/migrations/0021_remove_contentnode_stemmed_metaphone.py +++ b/kolibri/core/content/migrations/0021_remove_contentnode_stemmed_metaphone.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-10-21 17:21 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/content/migrations/0022_remove_file_available.py b/kolibri/core/content/migrations/0022_remove_file_available.py index 8fb17f80d4b..25d55badad7 100644 --- a/kolibri/core/content/migrations/0022_remove_file_available.py +++ b/kolibri/core/content/migrations/0022_remove_file_available.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-10-24 14:40 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/content/migrations/0023_contentnode_on_device_resources.py b/kolibri/core/content/migrations/0023_contentnode_on_device_resources.py index edce0ea6d15..80f531bed52 100644 --- a/kolibri/core/content/migrations/0023_contentnode_on_device_resources.py +++ b/kolibri/core/content/migrations/0023_contentnode_on_device_resources.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-11-11 19:25 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0024_channelmetadata_public.py b/kolibri/core/content/migrations/0024_channelmetadata_public.py index 2920c89be6c..22e4e85b048 100644 --- a/kolibri/core/content/migrations/0024_channelmetadata_public.py +++ b/kolibri/core/content/migrations/0024_channelmetadata_public.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-12-05 22:25 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0025_add_h5p_kind.py b/kolibri/core/content/migrations/0025_add_h5p_kind.py index 8e05204a9d9..a7306f22108 100644 --- a/kolibri/core/content/migrations/0025_add_h5p_kind.py +++ b/kolibri/core/content/migrations/0025_add_h5p_kind.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-12-19 02:29 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0026_contentnode_options.py b/kolibri/core/content/migrations/0026_contentnode_options.py index 5e3af287827..aae9e947dd5 100644 --- a/kolibri/core/content/migrations/0026_contentnode_options.py +++ b/kolibri/core/content/migrations/0026_contentnode_options.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-05-20 14:56 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/content/migrations/0027_channelmetadata_tagline.py b/kolibri/core/content/migrations/0027_channelmetadata_tagline.py index 86068a144f1..4dad4b152a9 100644 --- a/kolibri/core/content/migrations/0027_channelmetadata_tagline.py +++ b/kolibri/core/content/migrations/0027_channelmetadata_tagline.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-06-15 10:19 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0028_contentnode_metadata_labels.py b/kolibri/core/content/migrations/0028_contentnode_metadata_labels.py index 9ca7ef791bc..766577a30f0 100644 --- a/kolibri/core/content/migrations/0028_contentnode_metadata_labels.py +++ b/kolibri/core/content/migrations/0028_contentnode_metadata_labels.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-10-05 22:50 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0029_metadata_bitmasks.py b/kolibri/core/content/migrations/0029_metadata_bitmasks.py index 0e2a2acb41d..1d9e9e3c263 100644 --- a/kolibri/core/content/migrations/0029_metadata_bitmasks.py +++ b/kolibri/core/content/migrations/0029_metadata_bitmasks.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-10-11 20:40 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0030_contentnode_ancestors.py b/kolibri/core/content/migrations/0030_contentnode_ancestors.py index 61a1a348a17..7ab742fbe70 100644 --- a/kolibri/core/content/migrations/0030_contentnode_ancestors.py +++ b/kolibri/core/content/migrations/0030_contentnode_ancestors.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-10-11 20:51 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/content/migrations/0031_channelmetadata_partial.py b/kolibri/core/content/migrations/0031_channelmetadata_partial.py index c870cc48132..8bbb2463300 100644 --- a/kolibri/core/content/migrations/0031_channelmetadata_partial.py +++ b/kolibri/core/content/migrations/0031_channelmetadata_partial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2022-06-29 23:30 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0032_contentnode_admin_imported.py b/kolibri/core/content/migrations/0032_contentnode_admin_imported.py index ce1e107b464..f4a43868001 100644 --- a/kolibri/core/content/migrations/0032_contentnode_admin_imported.py +++ b/kolibri/core/content/migrations/0032_contentnode_admin_imported.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-02-15 19:08 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/migrations/0033_content_requests.py b/kolibri/core/content/migrations/0033_content_requests.py index 65cd3e66179..eebe853704b 100644 --- a/kolibri/core/content/migrations/0033_content_requests.py +++ b/kolibri/core/content/migrations/0033_content_requests.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-04-04 16:00 -from __future__ import unicode_literals - import django.db.models.deletion import morango.models.fields.uuids from django.db import migrations diff --git a/kolibri/core/content/migrations/0034_contentrequest_source_instance_id.py b/kolibri/core/content/migrations/0034_contentrequest_source_instance_id.py index 0b5ba3eb6ce..2b7554d1be1 100644 --- a/kolibri/core/content/migrations/0034_contentrequest_source_instance_id.py +++ b/kolibri/core/content/migrations/0034_contentrequest_source_instance_id.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-08-08 13:46 -from __future__ import unicode_literals - import morango.models.fields.uuids from django.db import migrations diff --git a/kolibri/core/content/migrations/0035_add_imscp_preset.py b/kolibri/core/content/migrations/0035_add_imscp_preset.py index 8573a8110a0..2fb14655be3 100644 --- a/kolibri/core/content/migrations/0035_add_imscp_preset.py +++ b/kolibri/core/content/migrations/0035_add_imscp_preset.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-10-20 07:03 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/content/models.py b/kolibri/core/content/models.py index a400d5600b7..9cb15586d7d 100644 --- a/kolibri/core/content/models.py +++ b/kolibri/core/content/models.py @@ -20,8 +20,6 @@ to calculate these fields if needed (this can frequently be more efficient than using the Django ORM for these calculations). """ -from __future__ import print_function - import os import uuid from gettext import gettext as _ diff --git a/kolibri/core/device/migrations/0001_initial.py b/kolibri/core/device/migrations/0001_initial.py index db1f8787248..cfe48f545ef 100644 --- a/kolibri/core/device/migrations/0001_initial.py +++ b/kolibri/core/device/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-08-16 23:05 -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/kolibri/core/device/migrations/0002_devicesettings_default_facility.py b/kolibri/core/device/migrations/0002_devicesettings_default_facility.py index 1f9650fa139..dc38777541b 100644 --- a/kolibri/core/device/migrations/0002_devicesettings_default_facility.py +++ b/kolibri/core/device/migrations/0002_devicesettings_default_facility.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-10-31 21:10 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations from django.db import models diff --git a/kolibri/core/device/migrations/0003_contentcachekey.py b/kolibri/core/device/migrations/0003_contentcachekey.py index 02cb61f1250..fdd56e53158 100644 --- a/kolibri/core/device/migrations/0003_contentcachekey.py +++ b/kolibri/core/device/migrations/0003_contentcachekey.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-09-05 17:20 -from __future__ import unicode_literals - import sqlite3 import time diff --git a/kolibri/core/device/migrations/0004_auto_20190306_0553.py b/kolibri/core/device/migrations/0004_auto_20190306_0553.py index 560cef4a679..c38ee138a89 100644 --- a/kolibri/core/device/migrations/0004_auto_20190306_0553.py +++ b/kolibri/core/device/migrations/0004_auto_20190306_0553.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-03-06 04:53 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/device/migrations/0005_auto_20191203_0951.py b/kolibri/core/device/migrations/0005_auto_20191203_0951.py index 5f427dd5d5a..65b72cb3a38 100644 --- a/kolibri/core/device/migrations/0005_auto_20191203_0951.py +++ b/kolibri/core/device/migrations/0005_auto_20191203_0951.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-12-03 17:51 -from __future__ import unicode_literals - from django.core.exceptions import ObjectDoesNotExist from django.db import migrations from django.db import models diff --git a/kolibri/core/device/migrations/0006_migrate_guest_access.py b/kolibri/core/device/migrations/0006_migrate_guest_access.py index a7a9af3c3e7..9e6920249aa 100644 --- a/kolibri/core/device/migrations/0006_migrate_guest_access.py +++ b/kolibri/core/device/migrations/0006_migrate_guest_access.py @@ -1,6 +1,4 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals - from django.core.exceptions import FieldDoesNotExist from django.core.exceptions import ObjectDoesNotExist from django.db import migrations diff --git a/kolibri/core/device/migrations/0007_deviceappkey.py b/kolibri/core/device/migrations/0007_deviceappkey.py index fe5a0bd7b52..79c75aa2f8e 100644 --- a/kolibri/core/device/migrations/0007_deviceappkey.py +++ b/kolibri/core/device/migrations/0007_deviceappkey.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-05-27 01:05 -from __future__ import unicode_literals - import uuid import morango.models.fields.uuids diff --git a/kolibri/core/device/migrations/0007_devicesettings_name.py b/kolibri/core/device/migrations/0007_devicesettings_name.py index 18fd8f7274b..f51187567c5 100644 --- a/kolibri/core/device/migrations/0007_devicesettings_name.py +++ b/kolibri/core/device/migrations/0007_devicesettings_name.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-04-01 17:37 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/device/migrations/0008_devicesettings_allow_other_browsers_to_connect.py b/kolibri/core/device/migrations/0008_devicesettings_allow_other_browsers_to_connect.py index 65c5be29312..d046872b047 100644 --- a/kolibri/core/device/migrations/0008_devicesettings_allow_other_browsers_to_connect.py +++ b/kolibri/core/device/migrations/0008_devicesettings_allow_other_browsers_to_connect.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-06-09 17:11 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/device/migrations/0008_merge_20200531_1829.py b/kolibri/core/device/migrations/0008_merge_20200531_1829.py index 5f4b4b6b412..633242912cb 100644 --- a/kolibri/core/device/migrations/0008_merge_20200531_1829.py +++ b/kolibri/core/device/migrations/0008_merge_20200531_1829.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-06-01 01:29 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/device/migrations/0009_merge_20200608_1716.py b/kolibri/core/device/migrations/0009_merge_20200608_1716.py index e71f09c7f4e..bbe0bc36288 100644 --- a/kolibri/core/device/migrations/0009_merge_20200608_1716.py +++ b/kolibri/core/device/migrations/0009_merge_20200608_1716.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-06-09 00:16 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/device/migrations/0010_sqlitelock.py b/kolibri/core/device/migrations/0010_sqlitelock.py index fb4d4697e01..a2f7b73d2cb 100644 --- a/kolibri/core/device/migrations/0010_sqlitelock.py +++ b/kolibri/core/device/migrations/0010_sqlitelock.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-04-14 19:33 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/device/migrations/0011_devicesettings_subset_of_users_device.py b/kolibri/core/device/migrations/0011_devicesettings_subset_of_users_device.py index 33a0c8347ae..63fa5e94aad 100644 --- a/kolibri/core/device/migrations/0011_devicesettings_subset_of_users_device.py +++ b/kolibri/core/device/migrations/0011_devicesettings_subset_of_users_device.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-05-27 14:37 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/device/migrations/0012_syncqueue.py b/kolibri/core/device/migrations/0012_syncqueue.py index 0762711f3d9..8c37cf70d38 100644 --- a/kolibri/core/device/migrations/0012_syncqueue.py +++ b/kolibri/core/device/migrations/0012_syncqueue.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-06-03 15:01 -from __future__ import unicode_literals - import time import uuid diff --git a/kolibri/core/device/migrations/0013_usersyncstatus.py b/kolibri/core/device/migrations/0013_usersyncstatus.py index bf9ba804ee7..374c5a4bcd3 100644 --- a/kolibri/core/device/migrations/0013_usersyncstatus.py +++ b/kolibri/core/device/migrations/0013_usersyncstatus.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-07-08 17:54 -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/kolibri/core/device/migrations/0014_syncqueue_instance_id.py b/kolibri/core/device/migrations/0014_syncqueue_instance_id.py index fcc454c055f..07297191f38 100644 --- a/kolibri/core/device/migrations/0014_syncqueue_instance_id.py +++ b/kolibri/core/device/migrations/0014_syncqueue_instance_id.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-08-24 17:37 -from __future__ import unicode_literals - from uuid import uuid4 import morango.models.fields.uuids diff --git a/kolibri/core/device/migrations/0015_syncqueue_no_fk.py b/kolibri/core/device/migrations/0015_syncqueue_no_fk.py index 3d272e2b6ab..588b16ae98c 100644 --- a/kolibri/core/device/migrations/0015_syncqueue_no_fk.py +++ b/kolibri/core/device/migrations/0015_syncqueue_no_fk.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-09-17 16:33 -from __future__ import unicode_literals - from uuid import uuid4 import morango.models.fields.uuids diff --git a/kolibri/core/device/migrations/0016_osuser.py b/kolibri/core/device/migrations/0016_osuser.py index f9fab0ff710..70b29593f25 100644 --- a/kolibri/core/device/migrations/0016_osuser.py +++ b/kolibri/core/device/migrations/0016_osuser.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2022-04-26 21:31 -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/kolibri/core/device/migrations/0017_extra_settings.py b/kolibri/core/device/migrations/0017_extra_settings.py index 802c80aeb46..deb79a01c20 100644 --- a/kolibri/core/device/migrations/0017_extra_settings.py +++ b/kolibri/core/device/migrations/0017_extra_settings.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2022-10-26 18:13 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.device.models diff --git a/kolibri/core/device/migrations/0018_add_learner_device_status.py b/kolibri/core/device/migrations/0018_add_learner_device_status.py index efa11b74d9f..405c9c83154 100644 --- a/kolibri/core/device/migrations/0018_add_learner_device_status.py +++ b/kolibri/core/device/migrations/0018_add_learner_device_status.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-02-01 15:46 -from __future__ import unicode_literals - import django.db.models.deletion import morango.models.fields.uuids from django.conf import settings diff --git a/kolibri/core/device/migrations/0019_syncqueue_and_status.py b/kolibri/core/device/migrations/0019_syncqueue_and_status.py index cb0f38b8e34..d337fc4bab9 100644 --- a/kolibri/core/device/migrations/0019_syncqueue_and_status.py +++ b/kolibri/core/device/migrations/0019_syncqueue_and_status.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-10-20 16:16 -from __future__ import unicode_literals - import django.db.models.deletion import morango.models.fields.uuids from django.db import connection diff --git a/kolibri/core/device/migrations/0020_fix_learner_device_status_choices.py b/kolibri/core/device/migrations/0020_fix_learner_device_status_choices.py index 592a5b76fb7..33ef3e7a0c3 100644 --- a/kolibri/core/device/migrations/0020_fix_learner_device_status_choices.py +++ b/kolibri/core/device/migrations/0020_fix_learner_device_status_choices.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-11-21 15:08 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/device/migrations/0021_default_demographic_fields.py b/kolibri/core/device/migrations/0021_default_demographic_fields.py index 98a4a74fa9d..30e46b89ff2 100644 --- a/kolibri/core/device/migrations/0021_default_demographic_fields.py +++ b/kolibri/core/device/migrations/0021_default_demographic_fields.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2024-03-28 15:35 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.auth.constants.demographics diff --git a/kolibri/core/device/migrations/0022_update_language_code_nyn_to_ny.py b/kolibri/core/device/migrations/0022_update_language_code_nyn_to_ny.py index 52984130557..fa0233be12f 100644 --- a/kolibri/core/device/migrations/0022_update_language_code_nyn_to_ny.py +++ b/kolibri/core/device/migrations/0022_update_language_code_nyn_to_ny.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2024-05-10 21:02 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.auth.constants.demographics diff --git a/kolibri/core/device/migrations/0023_learner_device_status_multiple_devices.py b/kolibri/core/device/migrations/0023_learner_device_status_multiple_devices.py index 9e1ef355795..e757fd4536a 100644 --- a/kolibri/core/device/migrations/0023_learner_device_status_multiple_devices.py +++ b/kolibri/core/device/migrations/0023_learner_device_status_multiple_devices.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2024-05-14 21:54 -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/kolibri/core/device/test/locale_middleware_urls.py b/kolibri/core/device/test/locale_middleware_urls.py index 72c91698137..63b25388df6 100644 --- a/kolibri/core/device/test/locale_middleware_urls.py +++ b/kolibri/core/device/test/locale_middleware_urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.urls import include from django.urls import path from django.urls import re_path diff --git a/kolibri/core/device/test/prefixed_locale_middleware_urls.py b/kolibri/core/device/test/prefixed_locale_middleware_urls.py index 213d824b4d6..2abe8fb7e86 100644 --- a/kolibri/core/device/test/prefixed_locale_middleware_urls.py +++ b/kolibri/core/device/test/prefixed_locale_middleware_urls.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - from django.urls import include from django.urls import path diff --git a/kolibri/core/device/test/test_locale_middleware.py b/kolibri/core/device/test/test_locale_middleware.py index b5d42d5b0c0..38bdc4de27c 100644 --- a/kolibri/core/device/test/test_locale_middleware.py +++ b/kolibri/core/device/test/test_locale_middleware.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import os from django.conf import settings diff --git a/kolibri/core/device/translation.py b/kolibri/core/device/translation.py index a3811cd864d..ed7701a44f3 100644 --- a/kolibri/core/device/translation.py +++ b/kolibri/core/device/translation.py @@ -1,8 +1,6 @@ """ Modified from django.utils.translation.trans_real """ -from __future__ import unicode_literals - import re from django.conf import settings diff --git a/kolibri/core/discovery/migrations/0001_initial.py b/kolibri/core/discovery/migrations/0001_initial.py index 477c2982d1e..105f18361e4 100644 --- a/kolibri/core/discovery/migrations/0001_initial.py +++ b/kolibri/core/discovery/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-05 19:15 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/discovery/migrations/0002_general_network_location_data_structure.py b/kolibri/core/discovery/migrations/0002_general_network_location_data_structure.py index cd54472d19f..7ef3fc8e93a 100644 --- a/kolibri/core/discovery/migrations/0002_general_network_location_data_structure.py +++ b/kolibri/core/discovery/migrations/0002_general_network_location_data_structure.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-12-06 09:49 -from __future__ import unicode_literals - import uuid from django.db import migrations diff --git a/kolibri/core/discovery/migrations/0003_networklocation_subset_of_users_device.py b/kolibri/core/discovery/migrations/0003_networklocation_subset_of_users_device.py index d4015cd4033..498585caf52 100644 --- a/kolibri/core/discovery/migrations/0003_networklocation_subset_of_users_device.py +++ b/kolibri/core/discovery/migrations/0003_networklocation_subset_of_users_device.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-05-27 15:02 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/discovery/migrations/0004_str_default_id.py b/kolibri/core/discovery/migrations/0004_str_default_id.py index 62d89fdc717..865ba92a0c3 100644 --- a/kolibri/core/discovery/migrations/0004_str_default_id.py +++ b/kolibri/core/discovery/migrations/0004_str_default_id.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2022-05-16 23:03 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/discovery/migrations/0005_add_connection_tracking_metadata.py b/kolibri/core/discovery/migrations/0005_add_connection_tracking_metadata.py index 82acfe00b2c..73de613c4d1 100644 --- a/kolibri/core/discovery/migrations/0005_add_connection_tracking_metadata.py +++ b/kolibri/core/discovery/migrations/0005_add_connection_tracking_metadata.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-02-15 20:55 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/discovery/migrations/0006_networklocation_min_content_schema_version.py b/kolibri/core/discovery/migrations/0006_networklocation_min_content_schema_version.py index 0f928ab6189..1971473a2f4 100644 --- a/kolibri/core/discovery/migrations/0006_networklocation_min_content_schema_version.py +++ b/kolibri/core/discovery/migrations/0006_networklocation_min_content_schema_version.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-03-15 20:25 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/discovery/migrations/0007_device_pinning.py b/kolibri/core/discovery/migrations/0007_device_pinning.py index 019730c56d0..5dcabdbe440 100644 --- a/kolibri/core/discovery/migrations/0007_device_pinning.py +++ b/kolibri/core/discovery/migrations/0007_device_pinning.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-04-03 22:20 -from __future__ import unicode_literals - import django.db.models.deletion import django.utils.timezone from django.conf import settings diff --git a/kolibri/core/discovery/migrations/0008_networklocation_is_local.py b/kolibri/core/discovery/migrations/0008_networklocation_is_local.py index 705d9017398..2ef942687b4 100644 --- a/kolibri/core/discovery/migrations/0008_networklocation_is_local.py +++ b/kolibri/core/discovery/migrations/0008_networklocation_is_local.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-03-30 18:46 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/discovery/migrations/0009_add_location_type.py b/kolibri/core/discovery/migrations/0009_add_location_type.py index baa18aafda7..39cf8047ff6 100644 --- a/kolibri/core/discovery/migrations/0009_add_location_type.py +++ b/kolibri/core/discovery/migrations/0009_add_location_type.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-08-08 17:45 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/discovery/migrations/0010_set_location_type.py b/kolibri/core/discovery/migrations/0010_set_location_type.py index f63156f8fd5..6fb674c7a2b 100644 --- a/kolibri/core/discovery/migrations/0010_set_location_type.py +++ b/kolibri/core/discovery/migrations/0010_set_location_type.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-08-08 17:48 -from __future__ import unicode_literals - from django.db import migrations from django.db import OperationalError diff --git a/kolibri/core/discovery/migrations/0011_remove_networklocation_dynamic.py b/kolibri/core/discovery/migrations/0011_remove_networklocation_dynamic.py index aefde946831..90a2c9af9f7 100644 --- a/kolibri/core/discovery/migrations/0011_remove_networklocation_dynamic.py +++ b/kolibri/core/discovery/migrations/0011_remove_networklocation_dynamic.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-08-08 17:50 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/discovery/migrations/0012_remove_pinned_device.py b/kolibri/core/discovery/migrations/0012_remove_pinned_device.py index a6e64b36232..deef05a4f41 100644 --- a/kolibri/core/discovery/migrations/0012_remove_pinned_device.py +++ b/kolibri/core/discovery/migrations/0012_remove_pinned_device.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-10-17 23:38 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py b/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py index c4d87cf0b4a..e28e69cedbc 100644 --- a/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py +++ b/kolibri/core/discovery/migrations/0013_recreate_pinned_device.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-10-17 23:41 -from __future__ import unicode_literals - import django.db.models.deletion import django.utils.timezone import morango.models.fields.uuids diff --git a/kolibri/core/exams/migrations/0001_initial.py b/kolibri/core/exams/migrations/0001_initial.py index aa7de52bd58..54a3d0ca216 100644 --- a/kolibri/core/exams/migrations/0001_initial.py +++ b/kolibri/core/exams/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-05-16 22:34 -from __future__ import unicode_literals - import django.db.models.deletion import morango.models from django.db import migrations diff --git a/kolibri/core/exams/migrations/0002_update_exam_data_model.py b/kolibri/core/exams/migrations/0002_update_exam_data_model.py index 06e94b96fad..46f09e6e7b4 100644 --- a/kolibri/core/exams/migrations/0002_update_exam_data_model.py +++ b/kolibri/core/exams/migrations/0002_update_exam_data_model.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-12-30 21:59 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/exams/migrations/0003_auto_20190426_1015.py b/kolibri/core/exams/migrations/0003_auto_20190426_1015.py index b9fc0448e11..4352d707394 100644 --- a/kolibri/core/exams/migrations/0003_auto_20190426_1015.py +++ b/kolibri/core/exams/migrations/0003_auto_20190426_1015.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-26 17:15 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/exams/migrations/0004_exam_add_dates_opened_created_and_archived.py b/kolibri/core/exams/migrations/0004_exam_add_dates_opened_created_and_archived.py index c18273a1a7a..1e269c76189 100644 --- a/kolibri/core/exams/migrations/0004_exam_add_dates_opened_created_and_archived.py +++ b/kolibri/core/exams/migrations/0004_exam_add_dates_opened_created_and_archived.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2019-10-14 12:39 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/exams/migrations/0005_individualsyncableexam.py b/kolibri/core/exams/migrations/0005_individualsyncableexam.py index aba9b9b7a14..72560624073 100644 --- a/kolibri/core/exams/migrations/0005_individualsyncableexam.py +++ b/kolibri/core/exams/migrations/0005_individualsyncableexam.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-07-27 03:17 -from __future__ import unicode_literals - import django.db.models.deletion import morango.models.fields.uuids from django.conf import settings diff --git a/kolibri/core/exams/migrations/0006_nullable_creator_assigned_by.py b/kolibri/core/exams/migrations/0006_nullable_creator_assigned_by.py index 30815beb96a..5c4ea788fd1 100644 --- a/kolibri/core/exams/migrations/0006_nullable_creator_assigned_by.py +++ b/kolibri/core/exams/migrations/0006_nullable_creator_assigned_by.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-10-19 20:51 -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/kolibri/core/exams/migrations/0007_bump_data_model_version_to_3.py b/kolibri/core/exams/migrations/0007_bump_data_model_version_to_3.py index 03ab436c7d7..97852e04e62 100644 --- a/kolibri/core/exams/migrations/0007_bump_data_model_version_to_3.py +++ b/kolibri/core/exams/migrations/0007_bump_data_model_version_to_3.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-07-27 20:52 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/lessons/migrations/0001_initial.py b/kolibri/core/lessons/migrations/0001_initial.py index f155f897569..a835cd7da80 100644 --- a/kolibri/core/lessons/migrations/0001_initial.py +++ b/kolibri/core/lessons/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.8 on 2018-01-18 01:21 -from __future__ import unicode_literals - import django.db.models.deletion import morango.models from django.db import migrations diff --git a/kolibri/core/lessons/migrations/0002_auto_20180221_1115.py b/kolibri/core/lessons/migrations/0002_auto_20180221_1115.py index 0bc379f8db1..207e374ab16 100644 --- a/kolibri/core/lessons/migrations/0002_auto_20180221_1115.py +++ b/kolibri/core/lessons/migrations/0002_auto_20180221_1115.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.8 on 2018-02-21 19:15 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations from django.db import models diff --git a/kolibri/core/lessons/migrations/0003_individualsyncablelesson.py b/kolibri/core/lessons/migrations/0003_individualsyncablelesson.py index 1b5deea5fd1..06f83c845e6 100644 --- a/kolibri/core/lessons/migrations/0003_individualsyncablelesson.py +++ b/kolibri/core/lessons/migrations/0003_individualsyncablelesson.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-07-24 00:12 -from __future__ import unicode_literals - import django.db.models.deletion import morango.models.fields.uuids from django.conf import settings diff --git a/kolibri/core/lessons/migrations/0004_nullable_created_by_assigned_by.py b/kolibri/core/lessons/migrations/0004_nullable_created_by_assigned_by.py index 06a2aa8f6b0..8b589bf14cf 100644 --- a/kolibri/core/lessons/migrations/0004_nullable_created_by_assigned_by.py +++ b/kolibri/core/lessons/migrations/0004_nullable_created_by_assigned_by.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-10-19 20:54 -from __future__ import unicode_literals - import django.db.models.deletion from django.conf import settings from django.db import migrations diff --git a/kolibri/core/lessons/models.py b/kolibri/core/lessons/models.py index 87149a18c31..93c2dc796d3 100644 --- a/kolibri/core/lessons/models.py +++ b/kolibri/core/lessons/models.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import json from django.db import models diff --git a/kolibri/core/logger/csv_export.py b/kolibri/core/logger/csv_export.py index 61d6c122e00..d63f60acf42 100644 --- a/kolibri/core/logger/csv_export.py +++ b/kolibri/core/logger/csv_export.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import csv import datetime import logging diff --git a/kolibri/core/logger/migrations/0001_initial.py b/kolibri/core/logger/migrations/0001_initial.py index 4f4fd38cb39..d2ecce11d65 100644 --- a/kolibri/core/logger/migrations/0001_initial.py +++ b/kolibri/core/logger/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-05-16 22:32 -from __future__ import unicode_literals - import django.core.validators import django.db.models.deletion import morango.models diff --git a/kolibri/core/logger/migrations/0002_auto_20170518_1031.py b/kolibri/core/logger/migrations/0002_auto_20170518_1031.py index b8e5cfdbd11..71e313657b8 100644 --- a/kolibri/core/logger/migrations/0002_auto_20170518_1031.py +++ b/kolibri/core/logger/migrations/0002_auto_20170518_1031.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-05-18 17:31 -from __future__ import unicode_literals - from functools import partial from django.db import migrations diff --git a/kolibri/core/logger/migrations/0003_auto_20170531_1140.py b/kolibri/core/logger/migrations/0003_auto_20170531_1140.py index 74ccb3ed68c..0bfd498f722 100644 --- a/kolibri/core/logger/migrations/0003_auto_20170531_1140.py +++ b/kolibri/core/logger/migrations/0003_auto_20170531_1140.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.9.7 on 2017-05-31 18:40 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/logger/migrations/0004_tidy_progress_range.py b/kolibri/core/logger/migrations/0004_tidy_progress_range.py index 0310dc56dae..b5cfb3f2ab3 100644 --- a/kolibri/core/logger/migrations/0004_tidy_progress_range.py +++ b/kolibri/core/logger/migrations/0004_tidy_progress_range.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.10 on 2018-03-28 07:50 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/logger/migrations/0005_auto_20180514_1419.py b/kolibri/core/logger/migrations/0005_auto_20180514_1419.py index 97cf5491b86..d5b0c5ec3e7 100644 --- a/kolibri/core/logger/migrations/0005_auto_20180514_1419.py +++ b/kolibri/core/logger/migrations/0005_auto_20180514_1419.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-05-14 21:19 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/logger/migrations/0006_remove_examattemptlog_channel_id.py b/kolibri/core/logger/migrations/0006_remove_examattemptlog_channel_id.py index 43c217e27e3..1b54e2e837a 100644 --- a/kolibri/core/logger/migrations/0006_remove_examattemptlog_channel_id.py +++ b/kolibri/core/logger/migrations/0006_remove_examattemptlog_channel_id.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-01-17 20:43 -from __future__ import unicode_literals - from django.db import migrations diff --git a/kolibri/core/logger/migrations/0007_contentsessionlog_visitor_id.py b/kolibri/core/logger/migrations/0007_contentsessionlog_visitor_id.py index 5a020f33879..928e160ba38 100644 --- a/kolibri/core/logger/migrations/0007_contentsessionlog_visitor_id.py +++ b/kolibri/core/logger/migrations/0007_contentsessionlog_visitor_id.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.23 on 2020-03-24 03:19 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/logger/migrations/0008_usersessionlog_device_info.py b/kolibri/core/logger/migrations/0008_usersessionlog_device_info.py index e3708046ec4..23aa953f3ca 100644 --- a/kolibri/core/logger/migrations/0008_usersessionlog_device_info.py +++ b/kolibri/core/logger/migrations/0008_usersessionlog_device_info.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-10-29 07:28 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/logger/migrations/0009_null_channel_id_unconstrained_mastery_level.py b/kolibri/core/logger/migrations/0009_null_channel_id_unconstrained_mastery_level.py index cb893393376..0a20d4e3ac9 100644 --- a/kolibri/core/logger/migrations/0009_null_channel_id_unconstrained_mastery_level.py +++ b/kolibri/core/logger/migrations/0009_null_channel_id_unconstrained_mastery_level.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-10-15 00:33 -from __future__ import unicode_literals - import morango.models.fields.uuids from django.db import migrations from django.db import models diff --git a/kolibri/core/logger/migrations/0010_min_length_validation.py b/kolibri/core/logger/migrations/0010_min_length_validation.py index d04da2e7ec0..0d294967b15 100644 --- a/kolibri/core/logger/migrations/0010_min_length_validation.py +++ b/kolibri/core/logger/migrations/0010_min_length_validation.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-11-04 16:08 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations from django.db import models diff --git a/kolibri/core/logger/migrations/0011_masterylog_time_spent.py b/kolibri/core/logger/migrations/0011_masterylog_time_spent.py index 4bcabc1ee9d..06ad8480643 100644 --- a/kolibri/core/logger/migrations/0011_masterylog_time_spent.py +++ b/kolibri/core/logger/migrations/0011_masterylog_time_spent.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2021-11-18 00:38 -from __future__ import unicode_literals - import django.core.validators from django.db import migrations from django.db import models diff --git a/kolibri/core/logger/migrations/0012_generatecsvlogrequest.py b/kolibri/core/logger/migrations/0012_generatecsvlogrequest.py index 92f3163080a..270dc2bcb85 100644 --- a/kolibri/core/logger/migrations/0012_generatecsvlogrequest.py +++ b/kolibri/core/logger/migrations/0012_generatecsvlogrequest.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-02-09 18:01 -from __future__ import unicode_literals - import django.db.models.deletion from django.db import migrations from django.db import models diff --git a/kolibri/core/logger/migrations/0013_generatecsvlogrequest_allow_null_timestamps.py b/kolibri/core/logger/migrations/0013_generatecsvlogrequest_allow_null_timestamps.py index 1936576aba0..62de18c6621 100644 --- a/kolibri/core/logger/migrations/0013_generatecsvlogrequest_allow_null_timestamps.py +++ b/kolibri/core/logger/migrations/0013_generatecsvlogrequest_allow_null_timestamps.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-06-16 19:08 -from __future__ import unicode_literals - from django.db import migrations import kolibri.core.fields diff --git a/kolibri/core/logger/models.py b/kolibri/core/logger/models.py index d1c162878b9..a8797be7a8e 100644 --- a/kolibri/core/logger/models.py +++ b/kolibri/core/logger/models.py @@ -10,8 +10,6 @@ Eventually, it may also store user feedback on the content and the software. """ -from __future__ import unicode_literals - import logging from datetime import timedelta diff --git a/kolibri/core/notifications/migrations/0001_initial.py b/kolibri/core/notifications/migrations/0001_initial.py index 100ab628723..f7ab9c4bd27 100644 --- a/kolibri/core/notifications/migrations/0001_initial.py +++ b/kolibri/core/notifications/migrations/0001_initial.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-01-16 12:52 -from __future__ import unicode_literals - import morango.models from django.db import migrations from django.db import models diff --git a/kolibri/core/notifications/migrations/0002_notificationslog.py b/kolibri/core/notifications/migrations/0002_notificationslog.py index 6b075c79f5e..f4dae99a3ed 100644 --- a/kolibri/core/notifications/migrations/0002_notificationslog.py +++ b/kolibri/core/notifications/migrations/0002_notificationslog.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2019-01-23 20:01 -from __future__ import unicode_literals - import morango.models from django.db import migrations from django.db import models diff --git a/kolibri/core/notifications/migrations/0003_learnerprogressnotification_quiz_num_correct.py b/kolibri/core/notifications/migrations/0003_learnerprogressnotification_quiz_num_correct.py index d6edd6dcd7e..f9e0592ce39 100644 --- a/kolibri/core/notifications/migrations/0003_learnerprogressnotification_quiz_num_correct.py +++ b/kolibri/core/notifications/migrations/0003_learnerprogressnotification_quiz_num_correct.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.18 on 2019-02-13 21:18 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/notifications/migrations/0004_learnerprogressnotification_quiz_num_answered.py b/kolibri/core/notifications/migrations/0004_learnerprogressnotification_quiz_num_answered.py index fab48a25858..651b6f276b3 100644 --- a/kolibri/core/notifications/migrations/0004_learnerprogressnotification_quiz_num_answered.py +++ b/kolibri/core/notifications/migrations/0004_learnerprogressnotification_quiz_num_answered.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-07-12 18:08 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/notifications/migrations/0005_learnerprogressnotification_assignment_collections.py b/kolibri/core/notifications/migrations/0005_learnerprogressnotification_assignment_collections.py index e7347267a21..2a4da1b3453 100644 --- a/kolibri/core/notifications/migrations/0005_learnerprogressnotification_assignment_collections.py +++ b/kolibri/core/notifications/migrations/0005_learnerprogressnotification_assignment_collections.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-07-23 16:06 -from __future__ import unicode_literals - from django.db import migrations from django.db.utils import OperationalError diff --git a/kolibri/core/notifications/migrations/0006_fix_choices.py b/kolibri/core/notifications/migrations/0006_fix_choices.py index 13aceedf457..0eee836a057 100644 --- a/kolibri/core/notifications/migrations/0006_fix_choices.py +++ b/kolibri/core/notifications/migrations/0006_fix_choices.py @@ -1,7 +1,5 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2023-11-21 15:03 -from __future__ import unicode_literals - from django.db import migrations from django.db import models diff --git a/kolibri/core/notifications/models.py b/kolibri/core/notifications/models.py index 26665e7801d..c8922f4f2ac 100644 --- a/kolibri/core/notifications/models.py +++ b/kolibri/core/notifications/models.py @@ -7,8 +7,6 @@ None of these models will have Morango synchronization """ -from __future__ import unicode_literals - from django.conf import settings from django.db import models from morango.models import UUIDField diff --git a/kolibri/core/notifications/utils.py b/kolibri/core/notifications/utils.py index d3eaa4e6ead..4dfa9450bd5 100644 --- a/kolibri/core/notifications/utils.py +++ b/kolibri/core/notifications/utils.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import functools diff --git a/kolibri/core/public/constants/user_sync_options.py b/kolibri/core/public/constants/user_sync_options.py index 8f73befc065..964a864f65a 100644 --- a/kolibri/core/public/constants/user_sync_options.py +++ b/kolibri/core/public/constants/user_sync_options.py @@ -1,7 +1,7 @@ """ This module contains constants representing options for SoUD sync """ -from __future__ import unicode_literals + DELAYED_SYNC = 900 # client: seconds to mark sync as not recent diff --git a/kolibri/core/public/constants/user_sync_statuses.py b/kolibri/core/public/constants/user_sync_statuses.py index 35ce98db21a..41cd08c10ae 100644 --- a/kolibri/core/public/constants/user_sync_statuses.py +++ b/kolibri/core/public/constants/user_sync_statuses.py @@ -2,7 +2,6 @@ This module contains constants representing the possible statuses when a SoUD request to sync """ -from __future__ import unicode_literals SYNC = "SYNC" # can begin a sync right now diff --git a/kolibri/core/routers.py b/kolibri/core/routers.py index 21d7afe792a..c77d328e983 100644 --- a/kolibri/core/routers.py +++ b/kolibri/core/routers.py @@ -2,9 +2,6 @@ Custom router to allow bulk deletion Modified from https://github.com/miki725/django-rest-framework-bulk """ -from __future__ import print_function -from __future__ import unicode_literals - import copy from rest_framework.routers import DefaultRouter diff --git a/kolibri/core/test/test_drf_mixins.py b/kolibri/core/test/test_drf_mixins.py index ec215a64d45..c05e52c6e0a 100644 --- a/kolibri/core/test/test_drf_mixins.py +++ b/kolibri/core/test/test_drf_mixins.py @@ -1,6 +1,3 @@ -from __future__ import print_function -from __future__ import unicode_literals - import json from django.test import TestCase diff --git a/kolibri/core/utils/csv.py b/kolibri/core/utils/csv.py index 010232e9672..02d20c23a9c 100644 --- a/kolibri/core/utils/csv.py +++ b/kolibri/core/utils/csv.py @@ -1,5 +1,3 @@ -from __future__ import unicode_literals - import io import re from numbers import Number diff --git a/kolibri/utils/constants/installation_types.py b/kolibri/utils/constants/installation_types.py index 29e6c273e1d..1c005b6e70c 100644 --- a/kolibri/utils/constants/installation_types.py +++ b/kolibri/utils/constants/installation_types.py @@ -1,7 +1,7 @@ """ This module contains constants representing the type of "installers" used to install Kolibri. """ -from __future__ import unicode_literals + APK = "apk" DEB = "deb" diff --git a/kolibri/utils/pskolibri/__init__.py b/kolibri/utils/pskolibri/__init__.py index 7e552797efa..852fff785d2 100644 --- a/kolibri/utils/pskolibri/__init__.py +++ b/kolibri/utils/pskolibri/__init__.py @@ -42,9 +42,6 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. """ -from __future__ import absolute_import -from __future__ import division - import os import sys import time diff --git a/kolibri/utils/pskolibri/_pslinux.py b/kolibri/utils/pskolibri/_pslinux.py index 0e328942d96..2bd93cf7c02 100644 --- a/kolibri/utils/pskolibri/_pslinux.py +++ b/kolibri/utils/pskolibri/_pslinux.py @@ -1,7 +1,4 @@ """Linux platform implementation.""" -from __future__ import absolute_import -from __future__ import division - import errno import functools import os diff --git a/kolibri/utils/pskolibri/_psosx.py b/kolibri/utils/pskolibri/_psosx.py index f1acb0d240c..5a6f7a9d17b 100644 --- a/kolibri/utils/pskolibri/_psosx.py +++ b/kolibri/utils/pskolibri/_psosx.py @@ -1,3 +1 @@ """macOS platform implementation.""" -from __future__ import absolute_import -from __future__ import division diff --git a/kolibri/utils/pskolibri/_pswindows.py b/kolibri/utils/pskolibri/_pswindows.py index 740c4b49731..8483cde9c0c 100644 --- a/kolibri/utils/pskolibri/_pswindows.py +++ b/kolibri/utils/pskolibri/_pswindows.py @@ -1,7 +1,4 @@ """Windows platform implementation.""" -from __future__ import absolute_import -from __future__ import division - import ctypes import errno import functools diff --git a/kolibri/utils/pskolibri/common.py b/kolibri/utils/pskolibri/common.py index 43bc7d5f259..829c61f3676 100644 --- a/kolibri/utils/pskolibri/common.py +++ b/kolibri/utils/pskolibri/common.py @@ -1,6 +1,3 @@ -from __future__ import absolute_import -from __future__ import division - import functools import io import os diff --git a/kolibri/utils/tests/test_cli.py b/kolibri/utils/tests/test_cli.py index 412b1b08da6..a74bdca10b7 100755 --- a/kolibri/utils/tests/test_cli.py +++ b/kolibri/utils/tests/test_cli.py @@ -1,9 +1,6 @@ """ Tests for `kolibri.utils.cli` module. """ -from __future__ import absolute_import -from __future__ import print_function - import logging import os import tempfile diff --git a/kolibri/utils/tests/test_main.py b/kolibri/utils/tests/test_main.py index 64c6356611e..43b688ba2e7 100755 --- a/kolibri/utils/tests/test_main.py +++ b/kolibri/utils/tests/test_main.py @@ -1,9 +1,6 @@ """ Tests for `kolibri.utils.main` module. """ -from __future__ import absolute_import -from __future__ import print_function - import unittest import pytest diff --git a/kolibri/utils/version.py b/kolibri/utils/version.py index 9aef3e1304d..c74f3849683 100644 --- a/kolibri/utils/version.py +++ b/kolibri/utils/version.py @@ -82,11 +82,6 @@ ``__init__``, because ``setup.py`` cannot depend on the import of other packages at install-time (which is when the version is generated and stored). """ -from __future__ import absolute_import -from __future__ import division -from __future__ import print_function -from __future__ import unicode_literals - import datetime import logging import os diff --git a/packages/kolibri-tools/lib/i18n/fonts.py b/packages/kolibri-tools/lib/i18n/fonts.py index 1d3cdc7b830..e0324b7c70e 100644 --- a/packages/kolibri-tools/lib/i18n/fonts.py +++ b/packages/kolibri-tools/lib/i18n/fonts.py @@ -3,8 +3,6 @@ For usage instructions, see: https://kolibri-dev.readthedocs.io/en/develop/references/i18n.html """ -from __future__ import unicode_literals - import argparse import base64 import io diff --git a/test/test_cli_at_import.py b/test/test_cli_at_import.py index 397091bc159..ecae6157634 100644 --- a/test/test_cli_at_import.py +++ b/test/test_cli_at_import.py @@ -4,9 +4,6 @@ so that any attempt to access the Django database during the running of these cli methods will result in an error and test failure. """ -from __future__ import absolute_import -from __future__ import print_function - from mock import patch From ff05febaca9c691ef2817a1f9799e568005132e5 Mon Sep 17 00:00:00 2001 From: Richard Tibbles Date: Mon, 26 Aug 2024 13:20:28 -0700 Subject: [PATCH 2/2] Remove unneeded Python 2/3 compatibility clarification for migrations. --- docs/backend_architecture/upgrade.rst | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/docs/backend_architecture/upgrade.rst b/docs/backend_architecture/upgrade.rst index 1a044e73738..dfa3997a22d 100644 --- a/docs/backend_architecture/upgrade.rst +++ b/docs/backend_architecture/upgrade.rst @@ -14,11 +14,7 @@ these migrations can be generated by executing ``kolibri manage makemigrations`` This will trigger the Django management command that will inspect the current model schema, the current migrations, and generate new migrations to cover any -discrepancies. For some migrations, manual editing will be required to ensure -compatibility with Python 2 and 3 - this normally happens for Django Model fields -that take a ``choices`` keyword argument, where the choices are strings. The -strings should have no prefix (``u`` or ``b``) and the migration should contain -``from __future__ import unicode_literals`` as an import. +discrepancies. For any migrations involving Foreign keys to the FacilityUser model, the migration will automatically be generated by Django to use a swappable dependency on settings.AUTH_USER_MODEL.