From eaa4b3ef997cc185494c033acb0ddc8f20a16555 Mon Sep 17 00:00:00 2001 From: Julian Arni Date: Mon, 19 Aug 2013 11:23:58 -0400 Subject: [PATCH] Pep8 and pylint fixes --- .../contentstore/tests/test_assets.py | 5 ---- cms/djangoapps/contentstore/views/assets.py | 2 -- .../contentstore/views/import_export.py | 25 +++++++++---------- 3 files changed, 12 insertions(+), 20 deletions(-) diff --git a/cms/djangoapps/contentstore/tests/test_assets.py b/cms/djangoapps/contentstore/tests/test_assets.py index 9bde503b4d..2f158cfda6 100644 --- a/cms/djangoapps/contentstore/tests/test_assets.py +++ b/cms/djangoapps/contentstore/tests/test_assets.py @@ -2,12 +2,7 @@ Unit tests for the asset upload endpoint. """ -import os import json -import shutil -import tarfile -import tempfile -from subprocess import call from datetime import datetime from io import BytesIO from pytz import UTC diff --git a/cms/djangoapps/contentstore/views/assets.py b/cms/djangoapps/contentstore/views/assets.py index 23f855d33c..f8483d9338 100644 --- a/cms/djangoapps/contentstore/views/assets.py +++ b/cms/djangoapps/contentstore/views/assets.py @@ -38,8 +38,6 @@ from util.json_request import JsonResponse __all__ = ['asset_index', 'upload_asset'] -MAX_UP_LENGTH = 20000352 # Max chunk size - # Regex to capture Content-Range header ranges. CONTENT_RE = re.compile(r"(?P\d{1,11})-(?P\d{1,11})/(?P\d{1,11})") diff --git a/cms/djangoapps/contentstore/views/import_export.py b/cms/djangoapps/contentstore/views/import_export.py index 83bcdd402f..37d9ed4ed3 100644 --- a/cms/djangoapps/contentstore/views/import_export.py +++ b/cms/djangoapps/contentstore/views/import_export.py @@ -63,7 +63,7 @@ def import_course(request, org, course, name): filename = request.FILES['course-data'].name if not filename.endswith('.tar.gz'): return JsonResponse( - { 'ErrMsg': 'We only support uploading a .tar.gz file.' }, + {'ErrMsg': 'We only support uploading a .tar.gz file.'}, status=415 ) temp_filepath = course_dir / filename @@ -96,11 +96,10 @@ def import_course(request, org, course, name): content_range['start'] ) return JsonResponse( - { 'ErrMsg': 'File upload corrupted. Please try again' }, + {'ErrMsg': 'File upload corrupted. Please try again'}, status=409 ) - with open(temp_filepath, mode) as temp_file: for chunk in request.FILES['course-data'].chunks(): temp_file.write(chunk) @@ -121,8 +120,8 @@ def import_course(request, org, course, name): 'name': location.name }), "thumbnailUrl": "" - }] - }) + }] + }) else: # This was the last chunk. @@ -167,7 +166,7 @@ def import_course(request, org, course, name): if not dirpath: return JsonResponse( - {'ErrMsg': 'Could not find the course.xml file in the package.' }, + {'ErrMsg': 'Could not find the course.xml file in the package.'}, status=415 ) @@ -178,13 +177,13 @@ def import_course(request, org, course, name): shutil.move(dirpath / fname, course_dir) _module_store, course_items = import_from_xml( - modulestore('direct'), - settings.GITHUB_REPO_ROOT, - [course_subdir], - load_error_modules=False, - static_content_store=contentstore(), - target_location_namespace=location, - draft_store=modulestore() + modulestore('direct'), + settings.GITHUB_REPO_ROOT, + [course_subdir], + load_error_modules=False, + static_content_store=contentstore(), + target_location_namespace=location, + draft_store=modulestore() ) # we can blow this away when we're done importing.