summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorMartin <martin@leo.fri1.uni-lj.si>2015-09-21 10:12:40 +0200
committerMartin <martin@leo.fri1.uni-lj.si>2015-09-21 10:12:40 +0200
commitf352ad0ea7e6e85ab42e56822779a4bf06400f04 (patch)
treec18df02548049104f82785710c2f0be814ee460c /server
parentfe545bd1c782f5228323d360181d7aeccfce0324 (diff)
Changed testing in util.py
Changed output when timeout occurs in Python
Diffstat (limited to 'server')
-rw-r--r--server/python_session.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/python_session.py b/server/python_session.py
index 62fcbf8..7ffb070 100644
--- a/server/python_session.py
+++ b/server/python_session.py
@@ -51,7 +51,7 @@ class PythonSession(object):
if conn.poll(real_timeout):
results.append(conn.recv())
else:
- results.append('timed out')
+ results.append((None, None, None, 'timed out'))
p.terminate()
return results