Skip to content

Commit 0d1e012

Browse files
authored
remove awful unneeded __get_env_var function
1 parent f72fa46 commit 0d1e012

File tree

1 file changed

+4
-12
lines changed

1 file changed

+4
-12
lines changed

src/server_common/helpers.py

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -48,19 +48,11 @@ def get_macro_values() -> Dict[str, str]:
4848
print("Defined macros: " + str(macros))
4949
return macros
5050

51-
52-
def _get_env_var(name: str) -> str:
53-
try:
54-
return os.environ[name]
55-
except:
56-
return ""
57-
58-
5951
MACROS = {
60-
"$(MYPVPREFIX)": _get_env_var("MYPVPREFIX"),
61-
"$(EPICS_KIT_ROOT)": _get_env_var("EPICS_KIT_ROOT"),
62-
"$(ICPCONFIGROOT)": _get_env_var("ICPCONFIGROOT"),
63-
"$(ICPVARDIR)": _get_env_var("ICPVARDIR"),
52+
"$(MYPVPREFIX)": os.environ.get("MYPVPREFIX", ""),
53+
"$(EPICS_KIT_ROOT)": os.environ.get("EPICS_KIT_ROOT", ""),
54+
"$(ICPCONFIGROOT)": os.environ.get("ICPCONFIGROOT", ""),
55+
"$(ICPVARDIR)": os.environ.get("ICPVARDIR", ""),
6456
}
6557
CONTROL_SYSTEM_PREFIX = MACROS["$(MYPVPREFIX)"] + "CS:"
6658
PVPREFIX_MACRO = "$(MYPVPREFIX)"

0 commit comments

Comments
 (0)