Merge branch 'master' of https://github.com/robcarver17/pysystemtrade

Author: rob

sysdata/production/new_capital.py

@@ -32,9 +32,6 @@ class capitalData(baseData):
 
     def get_current_total_capital(self) -> float:
         pd_series = self.get_total_capital_pd_series()
-        if pd_series is missing_data:
-            return missing_data
-
         return float(pd_series[-1])
 
     def get_current_broker_account_value(self) -> float:
@@ -51,11 +48,7 @@ def get_current_pandl_account(self) -> float:
         return float(pd_series[-1])
 
     def get_total_capital_pd_series(self) -> pd.Series:
-        try:
-            all_capital_series = self.get_df_of_all_global_capital()
-        except missingData:
-            return missing_data
-
+        all_capital_series = self.get_df_of_all_global_capital()
         return all_capital_series[CURRENT_CAPITAL_LABEL]
 
     def get_broker_account_value_pd_series(self) -> pd.Series:

sysproduction/update_strategy_capital.py

@@ -2,7 +2,7 @@
 import datetime
 
 from syscore.exceptions import missingData
-from syscore.constants import missing_data, success
+from syscore.constants import success
 
 from sysdata.data_blob import dataBlob
 from sysproduction.data.capital import dataCapital, dataMargin
@@ -72,11 +72,11 @@ def margin_strategy_allocation(self):
 
 def get_total_current_capital(data: dataBlob) -> float:
     data_capital = dataCapital(data)
-    total_capital = data_capital.get_current_total_capital()
-
-    if total_capital is missing_data:
+    try:
+        total_capital = data_capital.get_current_total_capital()
+    except missingData:
         data.log.critical("Can't allocate strategy capital without total capital")
-        raise Exception()
+        raise
 
     return total_capital