Merge pull request #2597 from edx/release

Release

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__)

cms/envs/common.py

@@ -251,7 +251,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

common/djangoapps/track/backends/django.py

@@ -28,7 +28,7 @@ LOGFIELDS = [
     'agent',
     'page',
     'time',
-    'host'
+    'host',
 ]
 
 

common/lib/capa/capa/capa_problem.py

@@ -54,7 +54,7 @@ html_problem_semantics = [
     "script",
     "hintgroup",
     "openendedparam",
-    "openendedrubric"
+    "openendedrubric",
 ]
 
 log = logging.getLogger(__name__)

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:

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',
 ]
 
 VIDEO_BUTTONS = {

lms/envs/common.py

@@ -756,8 +756,8 @@ main_vendor_js = [
     'js/vendor/ova/jquery-Watch.js',
     'js/vendor/ova/ova.js',
     'js/vendor/ova/catch/js/catch.js',
-    'js/vendor/ova/catch/js/handlebars-1.1.2.js'
-    'js/vendor/URI.min.js'
+    'js/vendor/ova/catch/js/handlebars-1.1.2.js',
+    'js/vendor/URI.min.js',
 ]
 
 discussion_js = sorted(rooted_glob(COMMON_ROOT / 'static', 'coffee/src/discussion/**/*.js'))

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]