Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: remove unused import and rename S3Boto3Storage constructor param #39

Merged
merged 1 commit into from
Jun 22, 2023
Merged

refactor: remove unused import and rename S3Boto3Storage constructor param #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 4 additions & 5 deletions openedxscorm/storage.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import os
from django.conf import settings

from django.core.files.storage import get_storage_class
from storages.backends.s3boto3 import S3Boto3Storage


Expand All @@ -13,12 +12,12 @@ class S3ScormStorage(S3Boto3Storage):
S3 backend for scorm metadata export
"""

def __init__(self, xblock, bucket, querystring_auth, querystring_expire):
def __init__(self, xblock, bucket_name=None, querystring_auth=None, querystring_expire=None):
self.xblock = xblock
# No need to serve assets from a custom domain.
self.custom_domain = None
super().__init__(
bucket=bucket,
bucket_name=bucket_name,
querystring_auth=querystring_auth,
querystring_expire=querystring_expire,
)
Expand Down Expand Up @@ -64,14 +63,14 @@ def s3(xblock):
Returns:
S3ScormStorage: An instance of the S3ScormStorage class.
"""
bucket = xblock.xblock_settings.get(
bucket_name = xblock.xblock_settings.get(
"S3_BUCKET_NAME", settings.AWS_STORAGE_BUCKET_NAME
)
querystring_auth = xblock.xblock_settings.get("S3_QUERY_AUTH", True)
querystring_expire = xblock.xblock_settings.get("S3_EXPIRES_IN", 604800)
return S3ScormStorage(
xblock=xblock,
bucket=bucket,
bucket_name=bucket_name,
querystring_auth=querystring_auth,
querystring_expire=querystring_expire,
)