Skip to content

Commit d1c4e70

Browse files
committed
Better exception handling
1 parent d18882f commit d1c4e70

1 file changed

Lines changed: 9 additions & 9 deletions

File tree

climada/util/finance.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -456,15 +456,15 @@ def world_bank_wealth_account(
456456
indicator=variable_name,
457457
).dropna()
458458
except ValueError:
459-
data_wealth = pd.Series(dtype=float)
460-
461-
if data_wealth.empty and "NW.PCA.TO" in variable_name:
462-
LOGGER.warning(
463-
"No data available for country. Using non-financial wealth instead"
464-
)
465-
gdp_year, gdp_val = gdp(cntry_iso, ref_year)
466-
fac = wealth2gdp(cntry_iso)[1]
467-
return gdp_year, np.around((fac * gdp_val), 1), 0
459+
if "NW.PCA.TO" in variable_name:
460+
LOGGER.warning(
461+
"No data available for country. Using non-financial wealth instead"
462+
)
463+
gdp_year, gdp_val = gdp(cntry_iso, ref_year)
464+
fac = wealth2gdp(cntry_iso)[1]
465+
return gdp_year, np.around((fac * gdp_val), 1), 0
466+
else:
467+
raise
468468

469469
years = data_wealth.index.values
470470
if ref_year in years:

0 commit comments

Comments
 (0)