a process or a list of other process wrappers which carry such data.\r
"""\r
\r
+from __future__ import division\r
+\r
import os\r
import sys\r
import traceback\r
Return value description.\r
"""\r
\r
- if text_file != '':\r
- with open(text_file, 'rb') as fp:\r
- text = (fp.read())\r
+ # TODO: Investigate if check is needed.\r
+ if not text_file:\r
+ return\r
+\r
+ with open(text_file, 'rb') as fp:\r
+ text = (fp.read())\r
+\r
return text\r
\r
\r
Return value description.\r
"""\r
\r
- if text_file != '':\r
- with open(text_file, 'wb') as fp:\r
- fp.write(text)\r
+ # TODO: Investigate if check is needed.\r
+ if not text_file:\r
+ return\r
+\r
+ with open(text_file, 'wb') as fp:\r
+ fp.write(text)\r
+\r
return text\r
\r
\r
def __init__(self,\r
description=None,\r
cmd=None,\r
- args=[],\r
+ args=None,\r
cwd=None,\r
env=None,\r
batch_wrapper=False):\r
Return value description.\r
"""\r
\r
+ if args is None:\r
+ args = []\r
+\r
self.cmd = cmd\r
if not description:\r
self.description = cmd\r
Return value description.\r
"""\r
\r
- if key != None and (value != None or start_stop != None):\r
+ if key is not None and (value is not None or start_stop is not None):\r
indent = '\t' * write_dict['indentationLevel']\r
if write_dict['format'] == 'xml':\r
if start_stop == 'start':\r
log_handle.write(header)\r
if format == 'xml':\r
log_handle.write(']]>\n')\r
- self.write_log(log_handle)\r
+ self.write_log(log_handle, format=format)\r
log_handle.close()\r
\r
def log_line(self, line):\r
\r
# Using *subprocess*\r
if sp:\r
- if process != None:\r
+ if process is not None:\r
# pid = process.pid\r
# log.logLine('process id %s\n' % pid)\r
\r
\r
# This is now used to ensure that the process has finished.\r
line = ''\r
- while line != None and process.poll() is None:\r
+ while line is not None and process.poll() is None:\r
try:\r
line = process.stdout.readline()\r
except:\r
break\r
# 3.1\r
try:\r
- self.log_line(str(line, encoding='utf-8'))\r
+ # TODO: Investigate previous eroneous statement.\r
+ # self.log_line(str(line, encoding='utf-8'))\r
+ self.log_line(str(line))\r
# 2.6\r
except:\r
self.log_line(line)\r
exit_code = -1\r
try:\r
stdout_lines = stdout.readlines()\r
+ # TODO: Investigate if this is the good behavior, close() does\r
+ # not return anything / None.\r
exit_code = stdout.close()\r
\r
stdout.close()\r
args_start = sys.argv.index('--') + 1\r
args = sys.argv[args_start:]\r
except:\r
- args_start = len(sys.argv) + 1\r
args = []\r
\r
if cmd is None:\r