diff --git a/cms/djangoapps/contentstore/management/commands/import.py b/cms/djangoapps/contentstore/management/commands/import.py index 6be03b7850..69aaa35a7d 100644 --- a/cms/djangoapps/contentstore/management/commands/import.py +++ b/cms/djangoapps/contentstore/management/commands/import.py @@ -1,5 +1,5 @@ ### -### Script for importing courseware form XML format +### Script for importing courseware from XML format ### from django.core.management.base import BaseCommand, CommandError diff --git a/cms/djangoapps/github_sync/tests/__init__.py b/cms/djangoapps/github_sync/tests/__init__.py index 39a94abb71..581ac3cb25 100644 --- a/cms/djangoapps/github_sync/tests/__init__.py +++ b/cms/djangoapps/github_sync/tests/__init__.py @@ -1,7 +1,10 @@ from django.test import TestCase from path import path import shutil -from github_sync import import_from_github, export_to_github, load_repo_settings, sync_all_with_github, sync_with_github +from github_sync import ( + import_from_github, export_to_github, load_repo_settings, + sync_all_with_github, sync_with_github +) from git import Repo from django.conf import settings from xmodule.modulestore.django import modulestore diff --git a/cms/envs/logsettings.py b/cms/envs/logsettings.py index 916cd77748..31130e33c6 100644 --- a/cms/envs/logsettings.py +++ b/cms/envs/logsettings.py @@ -33,7 +33,6 @@ def get_logger_config(log_dir, return { 'version': 1, - 'disable_existing_loggers': True, 'formatters' : { 'standard' : { 'format' : '%(asctime)s %(levelname)s %(process)d [%(name)s] %(filename)s:%(lineno)d - %(message)s',