diff --git a/i18n/extract.py b/i18n/extract.py index 2cb4ebe118..c517de3b51 100755 --- a/i18n/extract.py +++ b/i18n/extract.py @@ -15,11 +15,10 @@ See https://edx-wiki.atlassian.net/wiki/display/ENG/PO+File+workflow """ -import os +import os, sys, logging from datetime import datetime from polib import pofile -from logger import get_logger from config import BASE_DIR, LOCALE_DIR, CONFIGURATION from execute import execute, create_dir_if_necessary, remove_file @@ -34,7 +33,8 @@ BABEL_OUT = BASE_DIR.relpathto(CONFIGURATION.source_messages_dir.joinpath('mako. SOURCE_WARN = 'This English source file is machine-generated. Do not check it into github' def main (): - log = get_logger(__name__) + log = logging.getLogger(__name__) + logging.basicConfig(stream=sys.stdout, level=logging.INFO) create_dir_if_necessary(LOCALE_DIR) source_msgs_dir = CONFIGURATION.source_messages_dir diff --git a/i18n/generate.py b/i18n/generate.py index 1deb1beeae..48470796a2 100755 --- a/i18n/generate.py +++ b/i18n/generate.py @@ -13,10 +13,9 @@ languages to generate. """ -import os +import os, sys, logging from polib import pofile -from logger import get_logger from config import BASE_DIR, CONFIGURATION from execute import execute, remove_file @@ -72,7 +71,8 @@ def validate_files(dir, files_to_merge): raise Exception("I18N: Cannot generate because file not found: {0}".format(pathname)) def main (): - log = get_logger(__name__) + log = logging.getLogger(__name__) + logging.basicConfig(stream=sys.stdout, level=logging.INFO) for locale in CONFIGURATION.locales: merge(locale) diff --git a/i18n/logger.py b/i18n/logger.py deleted file mode 100644 index 20d767a032..0000000000 --- a/i18n/logger.py +++ /dev/null @@ -1,13 +0,0 @@ -import logging - -def get_logger(name): - """ - Returns a default logger. - logging.basicConfig does not render to the console - """ - log = logging.getLogger() - log.setLevel(logging.INFO) - log_handler = logging.StreamHandler() - log_handler.setFormatter(logging.Formatter('%(asctime)s [%(levelname)s] %(message)s')) - log.addHandler(log_handler) - return log diff --git a/i18n/tests/test_validate.py b/i18n/tests/test_validate.py index 6bb7164a50..67057a30e7 100644 --- a/i18n/tests/test_validate.py +++ b/i18n/tests/test_validate.py @@ -1,8 +1,7 @@ -import os +import os, sys, logging from unittest import TestCase from nose.plugins.skip import SkipTest -from logger import get_logger from config import LOCALE_DIR from execute import call @@ -10,10 +9,11 @@ def test_po_files(root=LOCALE_DIR): """ This is a generator. It yields all of the .po files under root, and tests each one. """ - log = get_logger(__name__) + log = logging.getLogger(__name__) + logging.basicConfig(stream=sys.stdout, level=logging.INFO) + for (dirpath, dirnames, filenames) in os.walk(root): for name in filenames: - print name (base, ext) = os.path.splitext(name) if ext.lower() == '.po': yield validate_po_file, os.path.join(dirpath, name), log