diff options
Diffstat (limited to 'python/tasks.py')
| -rw-r--r-- | python/tasks.py | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/python/tasks.py b/python/tasks.py index 7577d702..7cc28c41 100644 --- a/python/tasks.py +++ b/python/tasks.py @@ -1,10 +1,11 @@ import os import subprocess +import sys from intex.intex_scenarios import generate_scenarios -from json import loads +from json import loads, dumps -def build_portfolio(workdate, dealname, reinvflag): +def build_portfolios(workdate, dealname, reinvflag): rpath = os.path.join(os.environ['CODE_DIR'], "R") logpath = os.path.join(os.environ['LOG_DIR']) args = ["Rscript", "--vanilla", os.path.join(rpath, "build_portfolios.R"), \ @@ -36,5 +37,8 @@ class Rpc(object): @classmethod def from_json(cls, s): rpc = loads(s) - instance = cls(rpc['fun'], rpc['args']) + if sys.version_info[0] < 3: + instance = cls(rpc['fun'].encode(), [arg.encode() for arg in rpc['args']]) + else: + instance = cls(rpc['fun'], rpc['args']) return instance |