diff --git a/openedx/core/djangoapps/video_config/admin.py b/openedx/core/djangoapps/video_config/admin.py index 96b08b889f..6f1416ad45 100644 --- a/openedx/core/djangoapps/video_config/admin.py +++ b/openedx/core/djangoapps/video_config/admin.py @@ -2,6 +2,7 @@ Django admin dashboard configuration for Video XModule. """ +from __future__ import absolute_import from config_models.admin import ConfigurationModelAdmin, KeyedConfigurationModelAdmin from django.contrib import admin diff --git a/openedx/core/djangoapps/video_config/forms.py b/openedx/core/djangoapps/video_config/forms.py index 843f9e653d..4b0064286c 100644 --- a/openedx/core/djangoapps/video_config/forms.py +++ b/openedx/core/djangoapps/video_config/forms.py @@ -1,6 +1,7 @@ """ Defines a form for providing validation of HLS Playback course-specific configuration. """ +from __future__ import absolute_import import logging from django import forms diff --git a/openedx/core/djangoapps/video_config/migrations/0001_initial.py b/openedx/core/djangoapps/video_config/migrations/0001_initial.py index 3ce4503779..d6b53c00d5 100644 --- a/openedx/core/djangoapps/video_config/migrations/0001_initial.py +++ b/openedx/core/djangoapps/video_config/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.db import migrations, models from django.conf import settings diff --git a/openedx/core/djangoapps/video_config/migrations/0002_coursevideotranscriptenabledflag_videotranscriptenabledflag.py b/openedx/core/djangoapps/video_config/migrations/0002_coursevideotranscriptenabledflag_videotranscriptenabledflag.py index 79f4279deb..032e540d55 100644 --- a/openedx/core/djangoapps/video_config/migrations/0002_coursevideotranscriptenabledflag_videotranscriptenabledflag.py +++ b/openedx/core/djangoapps/video_config/migrations/0002_coursevideotranscriptenabledflag_videotranscriptenabledflag.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.db import migrations, models from django.conf import settings diff --git a/openedx/core/djangoapps/video_config/migrations/0003_transcriptmigrationsetting.py b/openedx/core/djangoapps/video_config/migrations/0003_transcriptmigrationsetting.py index a1e289d118..491ae3e0c1 100644 --- a/openedx/core/djangoapps/video_config/migrations/0003_transcriptmigrationsetting.py +++ b/openedx/core/djangoapps/video_config/migrations/0003_transcriptmigrationsetting.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.db import migrations, models import django.db.models.deletion diff --git a/openedx/core/djangoapps/video_config/migrations/0004_transcriptmigrationsetting_command_run.py b/openedx/core/djangoapps/video_config/migrations/0004_transcriptmigrationsetting_command_run.py index a7d34199e3..8be346620e 100644 --- a/openedx/core/djangoapps/video_config/migrations/0004_transcriptmigrationsetting_command_run.py +++ b/openedx/core/djangoapps/video_config/migrations/0004_transcriptmigrationsetting_command_run.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.13 on 2018-06-25 12:54 -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.db import migrations, models diff --git a/openedx/core/djangoapps/video_config/migrations/0005_auto_20180719_0752.py b/openedx/core/djangoapps/video_config/migrations/0005_auto_20180719_0752.py index 2ac1a957cd..7002e9f1d4 100644 --- a/openedx/core/djangoapps/video_config/migrations/0005_auto_20180719_0752.py +++ b/openedx/core/djangoapps/video_config/migrations/0005_auto_20180719_0752.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-19 07:52 -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.db import migrations, models import django.utils.timezone diff --git a/openedx/core/djangoapps/video_config/migrations/0006_videothumbnailetting_updatedcoursevideos.py b/openedx/core/djangoapps/video_config/migrations/0006_videothumbnailetting_updatedcoursevideos.py index 4a51bfcae6..20213e41b2 100644 --- a/openedx/core/djangoapps/video_config/migrations/0006_videothumbnailetting_updatedcoursevideos.py +++ b/openedx/core/djangoapps/video_config/migrations/0006_videothumbnailetting_updatedcoursevideos.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-08-15 19:13 -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.conf import settings from django.db import migrations, models diff --git a/openedx/core/djangoapps/video_config/migrations/0007_videothumbnailsetting_offset.py b/openedx/core/djangoapps/video_config/migrations/0007_videothumbnailsetting_offset.py index 6d534cd429..ee7eb17ca9 100644 --- a/openedx/core/djangoapps/video_config/migrations/0007_videothumbnailsetting_offset.py +++ b/openedx/core/djangoapps/video_config/migrations/0007_videothumbnailsetting_offset.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.15 on 2018-09-25 13:41 -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.db import migrations, models diff --git a/openedx/core/djangoapps/video_config/models.py b/openedx/core/djangoapps/video_config/models.py index 11f8ccb25d..8178357e8e 100644 --- a/openedx/core/djangoapps/video_config/models.py +++ b/openedx/core/djangoapps/video_config/models.py @@ -1,13 +1,15 @@ """ Configuration models for Video XModule """ -from django.db import models -from django.db.models import BooleanField, TextField, PositiveIntegerField +from __future__ import absolute_import + +import six from config_models.models import ConfigurationModel +from django.db import models +from django.db.models import BooleanField, PositiveIntegerField, TextField from model_utils.models import TimeStampedModel from opaque_keys.edx.django.models import CourseKeyField - URL_REGEX = r'^[a-zA-Z0-9\-_]*$' @@ -71,7 +73,7 @@ class CourseHLSPlaybackEnabledFlag(ConfigurationModel): not_en = "" return u"Course '{course_key}': HLS Playback {not_enabled}Enabled".format( - course_key=unicode(self.course_id), + course_key=six.text_type(self.course_id), not_enabled=not_en ) @@ -140,7 +142,7 @@ class CourseVideoTranscriptEnabledFlag(ConfigurationModel): not_en = "" return u"Course '{course_key}': Video Transcript {not_enabled}Enabled".format( - course_key=unicode(self.course_id), + course_key=six.text_type(self.course_id), not_enabled=not_en ) diff --git a/openedx/core/djangoapps/video_config/tests/test_models.py b/openedx/core/djangoapps/video_config/tests/test_models.py index 503e4f74ce..28caeaaebe 100644 --- a/openedx/core/djangoapps/video_config/tests/test_models.py +++ b/openedx/core/djangoapps/video_config/tests/test_models.py @@ -1,6 +1,7 @@ """ Tests for the models that configures HLS Playback feature. """ +from __future__ import absolute_import import ddt import itertools