From 67af4b8eb1a4ab1d6c2d6bb5c4a0fe692555d62c Mon Sep 17 00:00:00 2001 From: noraiz-anwar Date: Thu, 26 Sep 2019 16:15:05 +0500 Subject: [PATCH] fix course import issue --- cms/djangoapps/contentstore/tasks.py | 5 ++--- openedx/core/lib/extract_tar.py | 1 + 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cms/djangoapps/contentstore/tasks.py b/cms/djangoapps/contentstore/tasks.py index c6c22415f4..0725ca88c7 100644 --- a/cms/djangoapps/contentstore/tasks.py +++ b/cms/djangoapps/contentstore/tasks.py @@ -12,7 +12,6 @@ from datetime import datetime from math import ceil from tempfile import NamedTemporaryFile, mkdtemp -import six from celery import group from celery.task import task from celery.utils.log import get_task_logger @@ -750,8 +749,8 @@ def import_olx(self, user_id, course_key_string, archive_path, archive_name, lan # Locate the uploaded OLX archive (and download it from S3 if necessary) # Do everything in a try-except block to make sure everything is properly cleaned up. data_root = path(settings.GITHUB_REPO_ROOT) - subdir = base64.urlsafe_b64encode(six.b(repr(courselike_key))) - course_dir = data_root / subdir.decode('utf-8') + subdir = base64.urlsafe_b64encode(repr(courselike_key)) + course_dir = data_root / subdir try: self.status.set_state(u'Unpacking') diff --git a/openedx/core/lib/extract_tar.py b/openedx/core/lib/extract_tar.py index b542d9eaee..74dd72eb60 100644 --- a/openedx/core/lib/extract_tar.py +++ b/openedx/core/lib/extract_tar.py @@ -73,4 +73,5 @@ def safetar_extractall(tar_file, path=".", members=None): # pylint: disable=unu """ Safe version of `tar_file.extractall()`. """ + path = str(path) return tar_file.extractall(path, safemembers(tar_file, path))