diff options
| author | Roberto Hueso Gómez <rhueso@soleta.eu> | 2020-02-05 13:41:34 +0100 |
|---|---|---|
| committer | Alvaro Neira Ayuso <aneira@soleta.eu> | 2020-02-05 16:49:42 +0100 |
| commit | 1fd9f2e07c8a60860faa013699b85507824e4020 (patch) | |
| tree | d08f728569d63377de586507b6fb2549698f26cc | |
| parent | 1c236b4548ec8ac9511e6c608179a2baed850a12 (diff) | |
Use 'with' keyword for file reading
This is applied to /software and /hardware file reads.
We should use 'with' instead of opening and closing a file since this prevents
that files stay open after an exception is raised.
| -rw-r--r-- | src/ogRest.py | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/ogRest.py b/src/ogRest.py index b123505..20c5ba0 100644 --- a/src/ogRest.py +++ b/src/ogRest.py @@ -114,11 +114,8 @@ class ogThread(): jsonResp = jsonResponse() jsonResp.addElement('partition', request.getPartition()) - - f = open(path, "r") - output = f.read() - f.close() - jsonResp.addElement('software', output) + with open(path, 'r') as f: + jsonResp.addElement('software', f.read()) response = restResponse(ogResponses.OK, jsonResp) client.send(response.get()) @@ -132,10 +129,8 @@ class ogThread(): return jsonResp = jsonResponse() - f = open(path, "r") - text = f.read() - f.close() - jsonResp.addElement('hardware', text) + with open(path, 'r') as f: + jsonResp.addElement('hardware', f.read()) response = restResponse(ogResponses.OK, jsonResp) client.send(response.get()) |