From 7ffdff64a12ba69d1a5f5092ab2280a48e251d59 Mon Sep 17 00:00:00 2001 From: Stephen Diehl Date: Fri, 6 Jul 2012 10:47:11 -0400 Subject: [PATCH] Remove other refs to stdlib logging. --- zipline/components/datasource.py | 4 ---- zipline/finance/risk.py | 6 +++--- zipline/finance/trading.py | 6 +++--- zipline/transforms/base.py | 3 --- 4 files changed, 6 insertions(+), 13 deletions(-) diff --git a/zipline/components/datasource.py b/zipline/components/datasource.py index 4cafdb5f..e40e4e93 100644 --- a/zipline/components/datasource.py +++ b/zipline/components/datasource.py @@ -2,14 +2,10 @@ Commonly used messaging components. """ -import logging - import zipline.protocol as zp from zipline.core.component import Component from zipline.protocol import COMPONENT_TYPE -LOGGER = logging.getLogger('ZiplineLogger') - class DataSource(Component): """ Abstract baseclass for data sources. Subclass and implement send_all diff --git a/zipline/finance/risk.py b/zipline/finance/risk.py index 7021c581..8e687c49 100644 --- a/zipline/finance/risk.py +++ b/zipline/finance/risk.py @@ -36,14 +36,14 @@ Risk Report """ -import logging +import logbook import datetime import math import numpy as np import numpy.linalg as la from zipline.utils.date_utils import epoch_now -LOGGER = logging.getLogger('ZiplineLogger') +log = logbook.Logger('Risk') def advance_by_months(dt, jump_in_months): month = dt.month + jump_in_months @@ -255,7 +255,7 @@ class RiskMetrics(): cur_return = math.log(1.0 + r) + cur_return #this is a guard for a single day returning -100% except ValueError: - LOGGER.warn("{cur} return, zeroing the returns".format(cur=cur_return)) + log.warn("{cur} return, zeroing the returns".format(cur=cur_return)) cur_return = 0.0 compounded_returns.append(cur_return) diff --git a/zipline/finance/trading.py b/zipline/finance/trading.py index b2aacdc1..bf3a5374 100644 --- a/zipline/finance/trading.py +++ b/zipline/finance/trading.py @@ -1,12 +1,12 @@ import pytz import math -import logging +import logbook import datetime import zipline.protocol as zp from zipline.protocol import SIMULATION_STYLE -LOGGER = logging.getLogger('ZiplineLogger') +log = logbook.Logger('Transaction Simulator') class TransactionSimulator(object): @@ -39,7 +39,7 @@ class TransactionSimulator(object): log = "requested to trade zero shares of {sid}".format( sid=event.sid ) - LOGGER.debug(log) + log.debug(log) return if not self.open_orders.has_key(event.sid): diff --git a/zipline/transforms/base.py b/zipline/transforms/base.py index 2c8ab856..6e406efc 100644 --- a/zipline/transforms/base.py +++ b/zipline/transforms/base.py @@ -1,12 +1,9 @@ -import logging from zipline.core.component import Component import zipline.protocol as zp from zipline.protocol import CONTROL_PROTOCOL, COMPONENT_TYPE, \ CONTROL_FRAME, CONTROL_UNFRAME -LOGGER = logging.getLogger('ZiplineLogger') - class BaseTransform(Component): """ Top level execution entry point for the transform