diff options
| -rwxr-xr-x | DominoClient.py | 7 | ||||
| -rw-r--r-- | lib/util/miscutil.py | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/DominoClient.py b/DominoClient.py index 9cdcc39..8ce8ae7 100755 --- a/DominoClient.py +++ b/DominoClient.py @@ -118,11 +118,6 @@ class CLIHandler: CLIrespmsg.CLI_response = "Testing..." return CLIrespmsg -def read_templatefile(temp_filename): - f = open(temp_filename, 'r') - lines = f.read().splitlines() - - return lines class DominoClientCLIService(threading.Thread): def __init__(self, dominoclient, communicationhandler, interactive): @@ -315,7 +310,7 @@ class DominoClient: pub_msg.template_type = 'tosca-nfv-v1.0' try: - pub_msg.template = read_templatefile(toscafile) + pub_msg.template = miscutil.read_templatefile(toscafile) except IOError as e: logging.error('I/O error(%d): %s' , e.errno, e.strerror) return diff --git a/lib/util/miscutil.py b/lib/util/miscutil.py index 4afa565..ea284af 100644 --- a/lib/util/miscutil.py +++ b/lib/util/miscutil.py @@ -7,6 +7,6 @@ def read_templatefile(temp_filename): f = open(temp_filename, 'r') lines = f.read().splitlines() - + f.close() return lines |