diff --git a/res2df/fipreports.py b/res2df/fipreports.py index b0503a859..1d58ed359 100644 --- a/res2df/fipreports.py +++ b/res2df/fipreports.py @@ -12,7 +12,6 @@ from .common import parse_month, write_dframe_stdout_file from .res2csvlogger import getLogger_res2csv - from .resdatafiles import ResdataFiles logger = logging.getLogger(__name__) diff --git a/res2df/satfunc.py b/res2df/satfunc.py index 2aed8e133..fc0d61943 100644 --- a/res2df/satfunc.py +++ b/res2df/satfunc.py @@ -25,13 +25,14 @@ except ImportError: pass +from .common import comment_formatter +from .common import df2res as common_df2res +from .common import fill_reverse_parser as common_fill_reverse_parser from .common import ( - comment_formatter, handle_wanted_keywords, keyworddata_to_df, write_dframe_stdout_file, write_inc_stdout_file, - fill_reverse_parser as common_fill_reverse_parser, ) from .inferdims import inject_xxxdims_ntxxx from .res2csvlogger import getLogger_res2csv @@ -266,7 +267,7 @@ def df2res( """ string = "" - string += df2res( + string += common_df2res( satfunc_df, keywords=keywords, comments=comments,