From 3a7b265c8a194863279baedf67b2963632b6ed95 Mon Sep 17 00:00:00 2001 From: Calen Pennington Date: Thu, 13 Feb 2014 13:12:42 -0500 Subject: [PATCH] Add trailing commas to multiline lists, to prevent string concatenation bugs --- cms/djangoapps/contentstore/views/transcripts_ajax.py | 2 +- cms/envs/common.py | 2 +- common/djangoapps/track/backends/django.py | 2 +- common/lib/capa/capa/capa_problem.py | 2 +- common/test/acceptance/tests/__init__.py | 2 +- lms/djangoapps/courseware/features/video.py | 4 ++-- lms/envs/edx4edx_aws.py | 2 +- 7 files changed, 8 insertions(+), 8 deletions(-) diff --git a/cms/djangoapps/contentstore/views/transcripts_ajax.py b/cms/djangoapps/contentstore/views/transcripts_ajax.py index 03bc2067d1..aedc6c5c2a 100644 --- a/cms/djangoapps/contentstore/views/transcripts_ajax.py +++ b/cms/djangoapps/contentstore/views/transcripts_ajax.py @@ -47,7 +47,7 @@ __all__ = [ 'choose_transcripts', 'replace_transcripts', 'rename_transcripts', - 'save_transcripts' + 'save_transcripts', ] log = logging.getLogger(__name__) diff --git a/cms/envs/common.py b/cms/envs/common.py index 012200f875..4fc6c85934 100644 --- a/cms/envs/common.py +++ b/cms/envs/common.py @@ -248,7 +248,7 @@ STATICFILES_DIRS = [ LMS_ROOT / "static", # This is how you would use the textbook images locally - # ("book", ENV_ROOT / "book_images") + # ("book", ENV_ROOT / "book_images"), ] # Locale/Internationalization diff --git a/common/djangoapps/track/backends/django.py b/common/djangoapps/track/backends/django.py index 332a97cae2..fe60cc4478 100644 --- a/common/djangoapps/track/backends/django.py +++ b/common/djangoapps/track/backends/django.py @@ -28,7 +28,7 @@ LOGFIELDS = [ 'agent', 'page', 'time', - 'host' + 'host', ] diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py index d14af5b0d8..da51289eff 100644 --- a/common/lib/capa/capa/capa_problem.py +++ b/common/lib/capa/capa/capa_problem.py @@ -54,7 +54,7 @@ html_problem_semantics = [ "script", "hintgroup", "openendedparam", - "openendedrubric" + "openendedrubric", ] log = logging.getLogger(__name__) diff --git a/common/test/acceptance/tests/__init__.py b/common/test/acceptance/tests/__init__.py index 011a8d5140..cd2bd44cf3 100644 --- a/common/test/acceptance/tests/__init__.py +++ b/common/test/acceptance/tests/__init__.py @@ -3,7 +3,7 @@ import logging # Silence noisy loggers LOG_OVERRIDES = [ ('requests.packages.urllib3.connectionpool', logging.ERROR), - ('django.db.backends', logging.ERROR) + ('django.db.backends', logging.ERROR), ] for log_name, log_level in LOG_OVERRIDES: diff --git a/lms/djangoapps/courseware/features/video.py b/lms/djangoapps/courseware/features/video.py index 65933bfc59..7b04394f8d 100644 --- a/lms/djangoapps/courseware/features/video.py +++ b/lms/djangoapps/courseware/features/video.py @@ -9,10 +9,10 @@ from django.utils.translation import ugettext as _ HTML5_SOURCES = [ 'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp4', 'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.webm', - 'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.ogv' + 'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.ogv', ] HTML5_SOURCES_INCORRECT = [ - 'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp99' + 'https://s3.amazonaws.com/edx-course-videos/edx-intro/edX-FA12-cware-1_100.mp99', ] coursenum = 'test_course' diff --git a/lms/envs/edx4edx_aws.py b/lms/envs/edx4edx_aws.py index a78c477797..8d49c4cb28 100644 --- a/lms/envs/edx4edx_aws.py +++ b/lms/envs/edx4edx_aws.py @@ -34,7 +34,7 @@ STATICFILES_DIRS = [ ("subs", DATA_DIR / "subs"), # This is how you would use the textbook images locally -# ("book", ENV_ROOT / "book_images") +# ("book", ENV_ROOT / "book_images"), ] MAKO_TEMPLATES['course'] = [DATA_DIR, EDX4EDX_ROOT]