From 64f4b3412a6e33b2fe13583de3ef5cbff0832ddd Mon Sep 17 00:00:00 2001 From: "Michael D. M. Dryden" Date: Tue, 5 Apr 2016 17:50:37 -0400 Subject: [PATCH] Moved rest of source to native logging. --- dstat_interface/analysis.py | 2 +- dstat_interface/interface/save.py | 14 ++++++++------ dstat_interface/parameter_test.py | 7 +++++-- dstat_interface/params.py | 4 ++-- 4 files changed, 16 insertions(+), 11 deletions(-) diff --git a/dstat_interface/analysis.py b/dstat_interface/analysis.py index fe73ea4..366c38a 100755 --- a/dstat_interface/analysis.py +++ b/dstat_interface/analysis.py @@ -26,7 +26,7 @@ import pygtk import gtk from numpy import mean, trapz -logger = logging.getLogger(__name__) +logger = logging.getLogger('dstat.analysis') class AnalysisOptions(object): """Analysis options window.""" diff --git a/dstat_interface/interface/save.py b/dstat_interface/interface/save.py index 98d8abd..6908500 100755 --- a/dstat_interface/interface/save.py +++ b/dstat_interface/interface/save.py @@ -23,9 +23,11 @@ import os import gtk import numpy as np +import logging -from errors import InputError, VarError, ErrorLogger -_logger = ErrorLogger(sender="dstat-interface-save") +logger = logging.getLogger("dstat.interface.save") + +from errors import InputError, VarError from params import save_params, load_params def manSave(current_exp): @@ -45,7 +47,7 @@ def manSave(current_exp): if response == gtk.RESPONSE_OK: path = fcd.get_filename() - _logger.error(" ".join(("Selected filepath:", path)),'INFO') + logger.info("Selected filepath: %s", path) filter_selection = fcd.get_filter().get_name() if filter_selection.endswith("(.npy)"): @@ -86,7 +88,7 @@ def plotSave(plots): if response == gtk.RESPONSE_OK: path = fcd.get_filename() - _logger.error(" ".join(("Selected filepath:", path)),'INFO') + logger.info("Selected filepath: %s", path) filter_selection = fcd.get_filter().get_name() for i in plots: @@ -128,7 +130,7 @@ def man_param_save(window): if response == gtk.RESPONSE_OK: path = fcd.get_filename() - _logger.error(" ".join(("Selected filepath:", path)),'INFO') + logger.info("Selected filepath: %s", path) if not path.endswith(".yml"): path += '.yml' @@ -159,7 +161,7 @@ def man_param_load(window): if response == gtk.RESPONSE_OK: path = fcd.get_filename() - _logger.error(" ".join(("Selected filepath:", path)),'INFO') + logger.info("Selected filepath: %s", path) load_params(window, path) diff --git a/dstat_interface/parameter_test.py b/dstat_interface/parameter_test.py index 4330815..5600a8d 100755 --- a/dstat_interface/parameter_test.py +++ b/dstat_interface/parameter_test.py @@ -18,8 +18,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -from errors import ErrorLogger, InputError -_logger = ErrorLogger(sender="dstat-interface-parameters") +import logging + +from errors import InputError + +logger = logging.getLogger("dstat.parameter_test") def lsv_test(params): """Test LSV parameters for sanity""" diff --git a/dstat_interface/params.py b/dstat_interface/params.py index 25f3c90..3ad6181 100755 --- a/dstat_interface/params.py +++ b/dstat_interface/params.py @@ -39,7 +39,7 @@ def get_params(window): try: parameters.update(window.adc_pot.params) except InputError: - _logger.error("No gain selected.", 'INFO') + logger.info("No gain selected.") parameters.update(window.exp_window.get_params(selection)) parameters.update(window.analysis_opt_window.params) @@ -69,7 +69,7 @@ def set_params(window, params): window.adc_pot.params = params if not 'experiment_index' in params: - _logger.error("Missing experiment parameters.", 'WAR') + logger.warning("Missing experiment parameters.") return window.expcombobox.set_active( window.exp_window.classes[params['experiment_index']][0]) -- GitLab