diff --git a/binarycpython/utils/population_extensions/HPC.py b/binarycpython/utils/population_extensions/HPC.py index 61521df962f6cd49b2574ad1dd132716566b3b41..6d00fb104b333f6bbd9453da893ba67789d48b32 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 c6c33ebd621b95293b4ff7b991d8d77c073c6f96..cffe9abdcbc42fe063b7c779289ce8729f3ba699 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 6cb6a59f5153c044f15c2acbaeebf3ce71b8d79c..b047f2f7fee7be6974e5fc3a0cb53d42b89b27e7 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 29f041344b8c5d9d3d717c1db8ad31088c96cee7..dfe114047595a9d4c770f8c88906d1d4b5a37d90 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 fb1bed5c0f91b111de8c88cae0b12b9678908c66..ce23420abcc808a72d34e9130d483258b78551e7 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,