diff options
| author | Javier Jardón <jjardon@gnome.org> | 2015-03-13 13:02:24 +0000 |
|---|---|---|
| committer | Javier Jardón <jjardon@gnome.org> | 2015-03-16 16:34:55 +0000 |
| commit | aab6f2b5d3621d5760145d133a72495ef2ac1f25 (patch) | |
| tree | 561f7ca9b2ce8fd78fbf425d7b7fc3b7e12adcd5 /distbuild | |
| parent | db23e8e6406f98722d2d18bf61b8e85cd99415eb (diff) | |
| download | morph-aab6f2b5d3621d5760145d133a72495ef2ac1f25.tar.gz | |
Use python3 compatible notation for catching exceptions
Change-Id: Ibda7a938cd16e35517a531140f39ef4664d85c72
Diffstat (limited to 'distbuild')
| -rw-r--r-- | distbuild/build_controller.py | 2 | ||||
| -rw-r--r-- | distbuild/connection_machine.py | 4 | ||||
| -rw-r--r-- | distbuild/sockbuf.py | 4 | ||||
| -rw-r--r-- | distbuild/socketsrc.py | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/distbuild/build_controller.py b/distbuild/build_controller.py index 83e44f89..d6f3398f 100644 --- a/distbuild/build_controller.py +++ b/distbuild/build_controller.py @@ -303,7 +303,7 @@ class BuildController(distbuild.StateMachine): text = self._artifact_data.peek() try: artifact = distbuild.deserialise_artifact(text) - except ValueError, e: + except ValueError as e: logging.error(traceback.format_exc()) self.fail('Failed to compute build graph: %s' % e) return diff --git a/distbuild/connection_machine.py b/distbuild/connection_machine.py index b17a0e1d..b8248931 100644 --- a/distbuild/connection_machine.py +++ b/distbuild/connection_machine.py @@ -105,7 +105,7 @@ class ConnectionMachine(distbuild.StateMachine): distbuild.set_nonblocking(self._socket) try: self._socket.connect((self._addr, self._port)) - except socket.error, e: + except socket.error as e: if e.errno != errno.EINPROGRESS: raise socket.error( "%s (attempting connection to distbuild controller " @@ -117,7 +117,7 @@ class ConnectionMachine(distbuild.StateMachine): def _connect(self, event_source, event): try: self._socket.connect((self._addr, self._port)) - except socket.error, e: + except socket.error as e: logging.error( 'Failed to connect to %s:%s: %s' % (self._addr, self._port, str(e))) diff --git a/distbuild/sockbuf.py b/distbuild/sockbuf.py index 1cb524a5..6feb8669 100644 --- a/distbuild/sockbuf.py +++ b/distbuild/sockbuf.py @@ -143,7 +143,7 @@ class SocketBuffer(StateMachine): def _fill(self, event_source, event): try: data = event.sock.read(self._max_buffer) - except (IOError, OSError), e: + except (IOError, OSError) as e: logging.debug( '%s: _fill(): Exception %s from sock.read()', self, e) return [SocketError(event.sock, e)] @@ -163,7 +163,7 @@ class SocketBuffer(StateMachine): data = self._wbuf.read(max_write) try: n = event.sock.write(data) - except (IOError, OSError), e: + except (IOError, OSError) as e: logging.debug( '%s: _flush(): Exception %s from sock.write()', self, e) return [SocketError(event.sock, e)] diff --git a/distbuild/socketsrc.py b/distbuild/socketsrc.py index b2a21a16..daba1610 100644 --- a/distbuild/socketsrc.py +++ b/distbuild/socketsrc.py @@ -77,7 +77,7 @@ class ListeningSocketEventSource(EventSource): if self._accepting and self.sock.fileno() in r: try: conn, addr = self.sock.accept() - except socket.error, e: + except socket.error as e: return [SocketError(self.sock, e)] else: logging.info( |