Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions contentcuration/contentcuration/tests/test_createchannel.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
from .base import BaseTestCase
from .testdata import create_studio_file
from contentcuration import models
from contentcuration import models as cc

###
# Test helper functions
Expand Down Expand Up @@ -60,8 +59,8 @@ def setUpClass(cls):

def setUp(self):
super(CreateChannelTestCase, self).setUp()
self.topic = cc.ContentKind.objects.get(kind="topic")
self.license = cc.License.objects.all()[0]
self.topic = models.ContentKind.objects.get(kind="topic")
self.license = models.License.objects.all()[0]
self.fileinfo_audio = create_studio_file("abc", preset='audio', ext='mp3')
self.fileinfo_video = create_studio_file("def", preset='high_res_video', ext='mp4')
self.fileinfo_video_webm = create_studio_file("ghi", preset='high_res_video', ext='webm')
Expand Down
1 change: 0 additions & 1 deletion contentcuration/contentcuration/tests/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,6 @@ def test_guess_format_from_extension(self):
Make sure that we can guess file types listed in le_utils.file_formats.choices.
Note: if this test fails, it's likely because le_utils file formats aren't synced.
"""
from le_utils.constants import file_formats
known_extensions = list(dict(file_formats.choices).keys())

for ext in known_extensions:
Expand Down
1 change: 0 additions & 1 deletion contentcuration/contentcuration/utils/gcs_storage.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@

class GoogleCloudStorage(Storage):
def __init__(self, client=None):
from django.conf import settings

self.client = client if client else self._create_default_client()
self.bucket = self.client.get_bucket(settings.AWS_S3_BUCKET_NAME)
Expand Down