From 93f93421e35e32df4320c8de049991b9f5a7fcd3 Mon Sep 17 00:00:00 2001
From: dh00601 <dh00601@surrey.ac.uk>
Date: Thu, 30 Dec 2021 14:17:32 +0000
Subject: [PATCH] fixed imports
---
binarycpython/utils/population_extensions/HPC.py | 4 ++--
.../utils/population_extensions/Moe_di_Stefano_2017.py | 4 ++--
binarycpython/utils/population_extensions/cache.py | 6 +++---
.../utils/population_extensions/distribution_functions.py | 2 +-
binarycpython/utils/population_extensions/grid_logging.py | 2 +-
5 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/binarycpython/utils/population_extensions/HPC.py b/binarycpython/utils/population_extensions/HPC.py
index 61521df96..6d00fb104 100644
--- a/binarycpython/utils/population_extensions/HPC.py
+++ b/binarycpython/utils/population_extensions/HPC.py
@@ -21,8 +21,8 @@ from binarycpython.utils.functions import (
now,
)
-from binarycpython.utils.population_extensions._slurm import slurm
-from binarycpython.utils.population_extensions._condor import condor
+from binarycpython.utils.population_extensions.slurm import slurm
+from binarycpython.utils.population_extensions.condor import condor
class HPC(condor, slurm):
diff --git a/binarycpython/utils/population_extensions/Moe_di_Stefano_2017.py b/binarycpython/utils/population_extensions/Moe_di_Stefano_2017.py
index c6c33ebd6..cffe9abdc 100644
--- a/binarycpython/utils/population_extensions/Moe_di_Stefano_2017.py
+++ b/binarycpython/utils/population_extensions/Moe_di_Stefano_2017.py
@@ -17,11 +17,11 @@ from binarycpython.utils.functions import (
verbose_print,
)
from binarycpython.utils.dicts import update_dicts, normalize_dict
-from binarycpython.utils.population_extensions._distribution_functions import (
+from binarycpython.utils.population_extensions.distribution_functions import (
Moecache,
LOG_LN_CONVERTER,
)
-from binarycpython.utils.population_extensions._grid_options_defaults import (
+from binarycpython.utils.population_extensions.grid_options_defaults import (
_MOE2017_VERBOSITY_LEVEL,
)
from binarycpython.utils import moe_di_stefano_2017_data
diff --git a/binarycpython/utils/population_extensions/cache.py b/binarycpython/utils/population_extensions/cache.py
index 6cb6a59f5..b047f2f7f 100644
--- a/binarycpython/utils/population_extensions/cache.py
+++ b/binarycpython/utils/population_extensions/cache.py
@@ -146,9 +146,9 @@ class cache:
# detect if the function is already wrapped
x = func.split(".")
- modulename = "binarycpython.utils." + x[0]
- _ = importlib.import_module(modulename)
- _method = eval("module.{}.{}".format(x[0], x[1]))
+ modulename = "binarycpython.utils.population_extensions." + x[0]
+ module = importlib.import_module(modulename)
+ _method = eval("module.{}.{}".format(x[0], x[1])) # TODO: we can do this differently with some .get call instead of eval
_wrapped = getattr(_method, "__wrapped__", False)
# if function is wrapped...
diff --git a/binarycpython/utils/population_extensions/distribution_functions.py b/binarycpython/utils/population_extensions/distribution_functions.py
index 29f041344..dfe114047 100644
--- a/binarycpython/utils/population_extensions/distribution_functions.py
+++ b/binarycpython/utils/population_extensions/distribution_functions.py
@@ -36,7 +36,7 @@ import py_rinterpolate
from binarycpython.utils.useful_funcs import calc_period_from_sep, calc_sep_from_period
from binarycpython.utils.functions import verbose_print
-from binarycpython.utils.population_extensions._grid_options_defaults import (
+from binarycpython.utils.population_extensions.grid_options_defaults import (
_MOE2017_VERBOSITY_LEVEL,
_MOE2017_VERBOSITY_INTERPOLATOR_LEVEL,
)
diff --git a/binarycpython/utils/population_extensions/grid_logging.py b/binarycpython/utils/population_extensions/grid_logging.py
index fb1bed5c0..ce23420ab 100644
--- a/binarycpython/utils/population_extensions/grid_logging.py
+++ b/binarycpython/utils/population_extensions/grid_logging.py
@@ -18,7 +18,7 @@ from binarycpython.utils.functions import (
remove_file,
verbose_print
)
-from binarycpython.utils.population_extensions._grid_options_defaults import secs_per_day
+from binarycpython.utils.population_extensions.grid_options_defaults import secs_per_day
from binarycpython.utils.custom_logging_functions import (
binary_c_log_code,
--
GitLab