Skip to content

Commit f1d0eea

Browse files
committed
remove some os-specific code in _init
1 parent 9d803d5 commit f1d0eea

1 file changed

Lines changed: 17 additions & 38 deletions

File tree

oceanval/__init__.py

Lines changed: 17 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -1069,7 +1069,6 @@ def compare(model_dict=None, view=True):
10691069
)
10701070

10711071

1072-
import platform
10731072
import tempfile
10741073

10751074

@@ -1078,46 +1077,26 @@ def temp_check():
10781077
Function to check temp files
10791078
"""
10801079

1081-
if platform.system() == "Linux":
1082-
mylist = [f for f in glob.glob("/tmp/*")]
1083-
mylist = mylist + [f for f in glob.glob("/var/tmp/*")]
1084-
mylist = mylist + [f for f in glob.glob("/usr/tmp/*")]
1085-
mylist = [f for f in mylist if "nctoolkit" in f]
1080+
mylist = [f for f in glob.glob("/tmp/*")]
1081+
mylist = mylist + [f for f in glob.glob("/var/tmp/*")]
1082+
mylist = mylist + [f for f in glob.glob("/usr/tmp/*")]
1083+
mylist = [f for f in mylist if "nctoolkit" in f]
10861084

1087-
mylist = [x for x in mylist if "ecoval_output" in x]
1085+
mylist = [x for x in mylist if "ecoval_output" in x]
10881086

1089-
session_info["old_files"] = mylist
1087+
session_info["old_files"] = mylist
10901088

1091-
if len(mylist) > 0:
1092-
if len(mylist) == 1:
1093-
print(
1094-
f"{len(mylist)} temporary file was created by oceanval in prior or current "
1095-
f"sessions. Consider running oceanval.deep_clean!"
1096-
)
1097-
else:
1098-
print(
1099-
f"{len(mylist)} temporary files were created by oceanval in prior or current"
1100-
f" sessions. Consider running oceanval.deep_clean!"
1101-
)
1102-
1103-
else:
1104-
temp_folder = tempfile.gettempdir()
1105-
1106-
mylist = [f for f in glob.glob(f"{temp_folder}/*")]
1107-
mylist = [f for f in mylist if "nctoolkit" in f]
1108-
mylist = [x for x in mylist if "ecovaloutput" in x]
1109-
1110-
if len(mylist) > 0:
1111-
if len(mylist) == 1:
1112-
print(
1113-
f"{len(mylist)} temporary file was created by oceanval in prior or current "
1114-
f"sessions. Consider running oceanval.deep_clean!"
1115-
)
1116-
else:
1117-
print(
1118-
f"{len(mylist)} temporary files were created by oceanval in prior or "
1119-
f"current sessions. Consider running oceanval.deep_clean!"
1120-
)
1089+
if len(mylist) > 0:
1090+
if len(mylist) == 1:
1091+
print(
1092+
f"{len(mylist)} temporary file was created by oceanval in prior or current "
1093+
f"sessions. Consider running oceanval.deep_clean!"
1094+
)
1095+
else:
1096+
print(
1097+
f"{len(mylist)} temporary files were created by oceanval in prior or current"
1098+
f" sessions. Consider running oceanval.deep_clean!"
1099+
)
11211100

11221101

11231102
temp_check()

0 commit comments

Comments
 (0)