From 35667b31ddf1ce47a56ccbf4db9896dbc165ad0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 23 Mar 2018 23:33:36 +0100 Subject: Cleanup market from_config --- market.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'market.py') diff --git a/market.py b/market.py index 78ced1a..496ec45 100644 --- a/market.py +++ b/market.py @@ -14,9 +14,7 @@ class Market: trades = None balances = None - def __init__(self, ccxt_instance, args, - user_id=None, market_id=None, - report_path=None, pg_config=None): + def __init__(self, ccxt_instance, args, **kwargs): self.args = args self.debug = args.debug self.ccxt = ccxt_instance @@ -26,14 +24,11 @@ class Market: self.balances = BalanceStore(self) self.processor = Processor(self) - self.user_id = user_id - self.market_id = market_id - self.report_path = report_path - self.pg_config = pg_config + for key in ["user_id", "market_id", "report_path", "pg_config"]: + setattr(self, key, kwargs.get(key, None)) @classmethod - def from_config(cls, config, args, - user_id=None, market_id=None, report_path=None, pg_config=None): + def from_config(cls, config, args, **kwargs): config["apiKey"] = config.pop("key", None) ccxt_instance = ccxt.poloniexE(config) @@ -50,9 +45,7 @@ class Market: ccxt_instance.session.request = request_wrap.__get__(ccxt_instance.session, ccxt_instance.session.__class__) - return cls(ccxt_instance, args, - user_id=user_id, market_id=market_id, - pg_config=pg_config, report_path=report_path) + return cls(ccxt_instance, args, **kwargs) def store_report(self): self.report.merge(Portfolio.report) -- cgit v1.2.3