git://git.onelab.eu
/
nepi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
applied the except and raise fixers to the master branch to close the gap with py3
[nepi.git]
/
src
/
nepi
/
resources
/
ns3
/
ns3server.py
diff --git
a/src/nepi/resources/ns3/ns3server.py
b/src/nepi/resources/ns3/ns3server.py
index
e8a6f7d
..
8b3cd79
100644
(file)
--- a/
src/nepi/resources/ns3/ns3server.py
+++ b/
src/nepi/resources/ns3/ns3server.py
@@
-115,7
+115,7
@@
def recv_msg(conn):
while '\n' not in chunk:
try:
chunk = conn.recv(1024)
while '\n' not in chunk:
try:
chunk = conn.recv(1024)
- except (OSError, socket.error)
,
e:
+ except (OSError, socket.error)
as
e:
if e[0] != errno.EINTR:
raise
# Ignore eintr errors
if e[0] != errno.EINTR:
raise
# Ignore eintr errors
@@
-206,7
+206,7
@@
def run_server(socket_name, level = logging.INFO, ns_log = None,
try:
(msg_type, args, kwargs) = recv_msg(conn)
try:
(msg_type, args, kwargs) = recv_msg(conn)
- except socket.timeout
,
e:
+ except socket.timeout
as
e:
# Ingore time-out
close_socket(conn)
continue
# Ingore time-out
close_socket(conn)
continue