aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--python/intex/intex_scenarios.py5
-rw-r--r--python/utils/__init__.py8
2 files changed, 10 insertions, 3 deletions
diff --git a/python/intex/intex_scenarios.py b/python/intex/intex_scenarios.py
index ea0166b2..7842694b 100644
--- a/python/intex/intex_scenarios.py
+++ b/python/intex/intex_scenarios.py
@@ -80,7 +80,10 @@ def generate_scenarios(workdate, dealname, conn):
replace = "\g<a>{0:.3f}".format(defaultedprice)
try:
with open(os.path.join(basedir, "csv", dealname + ".config")) as fh:
- config = yaml.load(fh, Loader=yaml.FullLoader)
+ try:
+ config = yaml.load(fh, Loader=yaml.FullLoader)
+ except AttributeError:
+ config = yaml.load(fh)
except IOError:
logger.error("{0}: config file doesn't exist".format(dealname))
return
diff --git a/python/utils/__init__.py b/python/utils/__init__.py
index 84ab4b13..625e0f10 100644
--- a/python/utils/__init__.py
+++ b/python/utils/__init__.py
@@ -1,10 +1,14 @@
import logging
import os
+
class SerenitasFileHandler(logging.FileHandler):
"""simple class that encapsulates where we store our logs"""
- _formatter = logging.Formatter('%(asctime)s - %(name)s - %(levelname)s - %(message)s')
- def __init__(self, log_file: str):
+ _formatter = logging.Formatter(
+ "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
+ )
+
+ def __init__(self, log_file):
super().__init__(filename=os.path.join(os.getenv("LOG_DIR"), log_file))
self.setFormatter(SerenitasFileHandler._formatter)