Drop Python < 2.6 except statement compatibility trick

6 files changed, 36 insertions, 36 deletions

diff --git a/pysnmp/carrier/asyncio/dispatch.py b/pysnmp/carrier/asyncio/dispatch.py
index e92fe95e..da1399b4 100644
--- a/pysnmp/carrier/asyncio/dispatch.py
+++ b/pysnmp/carrier/asyncio/dispatch.py
@@ -68,7 +68,7 @@ class AsyncioDispatcher(AbstractTransportDispatcher):
                 raise
             except Exception:
                 raise PySnmpError(';'.join(traceback.format_exception(*sys.exc_info())))
-    
+
     def registerTransport(self, tDomain, transport):
         if self.loopingcall is None and self.getTimerResolution() > 0:
             # Avoid deprecation warning for asyncio.async()
diff --git a/pysnmp/carrier/asyncore/base.py b/pysnmp/carrier/asyncore/base.py
index 61c55221..e4824f32 100644
--- a/pysnmp/carrier/asyncore/base.py
+++ b/pysnmp/carrier/asyncore/base.py
@@ -34,8 +34,8 @@ class AbstractSocketTransport(asyncore.dispatcher, AbstractTransport):
                 )
             try:
                 sock = socket.socket(self.sockFamily, self.sockType)
-            except socket.error:
-                raise error.CarrierError('socket() failed: %s' % sys.exc_info()[1])
+            except socket.error as exc:
+                raise error.CarrierError('socket() failed: %s' % exc)
 
             try:
                 for b in socket.SO_RCVBUF, socket.SO_SNDBUF:
@@ -43,8 +43,8 @@ class AbstractSocketTransport(asyncore.dispatcher, AbstractTransport):
                     if bsize < self.bufferSize:
                         sock.setsockopt(socket.SOL_SOCKET, b, self.bufferSize)
                         debug.logger & debug.flagIO and debug.logger('%s: socket %d buffer size increased from %d to %d for buffer %d' % (self.__class__.__name__, sock.fileno(), bsize, self.bufferSize, b))
-            except Exception:
-                debug.logger & debug.flagIO and debug.logger('%s: socket buffer size option mangling failure for buffer: %s' % (self.__class__.__name__, sys.exc_info()[1]))
+            except Exception as exc:
+                debug.logger & debug.flagIO and debug.logger('%s: socket buffer size option mangling failure for buffer: %s' % (self.__class__.__name__, exc))
 
         # The socket map is managed by the AsyncoreDispatcher on
         # which this transport is registered. Here we just prepare
diff --git a/pysnmp/carrier/asyncore/dgram/base.py b/pysnmp/carrier/asyncore/dgram/base.py
index 95b24222..e9ffc9b0 100644
--- a/pysnmp/carrier/asyncore/dgram/base.py
+++ b/pysnmp/carrier/asyncore/dgram/base.py
@@ -45,16 +45,16 @@ class DgramSocketTransport(AbstractSocketTransport):
         if iface is not None:
             try:
                 self.socket.bind(iface)
-            except socket.error:
+            except socket.error as exc:
                 raise error.CarrierError(
-                    'bind() for %s failed: %s' % (iface is None and "<all local>" or iface, sys.exc_info()[1]))
+                    'bind() for %s failed: %s' % (iface is None and "<all local>" or iface, exc))
         return self
 
     def openServerMode(self, iface):
         try:
             self.socket.bind(iface)
-        except socket.error:
-            raise error.CarrierError('bind() for %s failed: %s' % (iface, sys.exc_info()[1],))
+        except socket.error as exc:
+            raise error.CarrierError('bind() for %s failed: %s' % (iface, exc))
         return self
 
     def enableBroadcast(self, flag=1):
@@ -62,8 +62,8 @@ class DgramSocketTransport(AbstractSocketTransport):
             self.socket.setsockopt(
                 socket.SOL_SOCKET, socket.SO_BROADCAST, flag
             )
-        except socket.error:
-            raise error.CarrierError('setsockopt() for SO_BROADCAST failed: %s' % (sys.exc_info()[1],))
+        except socket.error as exc:
+            raise error.CarrierError('setsockopt() for SO_BROADCAST failed: %s' % exc)
         debug.logger & debug.flagIO and debug.logger('enableBroadcast: %s option SO_BROADCAST on socket %s' % (flag and "enabled" or "disabled", self.socket.fileno()))
         return self
 
@@ -79,8 +79,8 @@ class DgramSocketTransport(AbstractSocketTransport):
             if self.socket.family == socket.AF_INET6:
                 self.socket.setsockopt(socket.SOL_IPV6, socket.IPV6_RECVPKTINFO, flag)
 
-        except socket.error:
-            raise error.CarrierError('setsockopt() for %s failed: %s' % (self.socket.family == socket.AF_INET6 and "IPV6_RECVPKTINFO" or "IP_PKTINFO", sys.exc_info()[1]))
+        except socket.error as exc:
+            raise error.CarrierError('setsockopt() for %s failed: %s' % (self.socket.family == socket.AF_INET6 and "IPV6_RECVPKTINFO" or "IP_PKTINFO", exc))
 
         self._sendto = sockmsg.getSendTo(self.addressType)
         self._recvfrom = sockmsg.getRecvFrom(self.addressType)
@@ -99,8 +99,8 @@ class DgramSocketTransport(AbstractSocketTransport):
                     socket.SOL_IPV6, socket.IPV6_TRANSPARENT, flag
                 )
 
-        except socket.error:
-            raise error.CarrierError('setsockopt() for IP_TRANSPARENT failed: %s' % sys.exc_info()[1])
+        except socket.error as exc:
+            raise error.CarrierError('setsockopt() for IP_TRANSPARENT failed: %s' % exc)
 
         except OSError:
             raise error.CarrierError('IP_TRANSPARENT socket option requires superuser priveleges')
@@ -148,11 +148,11 @@ class DgramSocketTransport(AbstractSocketTransport):
             self._sendto(
                 self.socket, outgoingMessage, transportAddress
             )
-        except socket.error:
-            if sys.exc_info()[1].args[0] in sockErrors:
-                debug.logger & debug.flagIO and debug.logger('handle_write: ignoring socket error %s' % (sys.exc_info()[1],))
+        except socket.error as exc:
+            if exc.args[0] in sockErrors:
+                debug.logger & debug.flagIO and debug.logger('handle_write: ignoring socket error %s' % exc)
             else:
-                raise error.CarrierError('sendto() failed for %s: %s' % (transportAddress, sys.exc_info()[1]))
+                raise error.CarrierError('sendto() failed for %s: %s' % (transportAddress, exc))
 
     def readable(self):
         return 1
@@ -169,13 +169,13 @@ class DgramSocketTransport(AbstractSocketTransport):
             else:
                 self._cbFun(self, transportAddress, incomingMessage)
                 return
-        except socket.error:
-            if sys.exc_info()[1].args[0] in sockErrors:
-                debug.logger & debug.flagIO and debug.logger('handle_read: known socket error %s' % (sys.exc_info()[1],))
-                sockErrors[sys.exc_info()[1].args[0]] and self.handle_close()
+        except socket.error as exc:
+            if exc.args[0] in sockErrors:
+                debug.logger & debug.flagIO and debug.logger('handle_read: known socket error %s' % exc)
+                sockErrors[exc.args[0]] and self.handle_close()
                 return
             else:
-                raise error.CarrierError('recvfrom() failed: %s' % (sys.exc_info()[1],))
+                raise error.CarrierError('recvfrom() failed: %s' % exc)
 
     def handle_close(self):
         pass  # no datagram connection
diff --git a/pysnmp/carrier/twisted/dgram/base.py b/pysnmp/carrier/twisted/dgram/base.py
index 4995aec4..4386b702 100644
--- a/pysnmp/carrier/twisted/dgram/base.py
+++ b/pysnmp/carrier/twisted/dgram/base.py
@@ -32,8 +32,8 @@ class DgramTwistedTransport(DatagramProtocol, AbstractTwistedTransport):
             debug.logger & debug.flagIO and debug.logger('startProtocol: transportAddress %r outgoingMessage %s' % (transportAddress, debug.hexdump(outgoingMessage)))
             try:
                 self.transport.write(outgoingMessage, transportAddress)
-            except Exception:
-                raise error.CarrierError('Twisted exception: %s' % (sys.exc_info()[1],))
+            except Exception as exc:
+                raise error.CarrierError('Twisted exception: %s' % exc)
 
     def stopProtocol(self):
         debug.logger & debug.flagIO and debug.logger('stopProtocol: invoked')
@@ -45,5 +45,5 @@ class DgramTwistedTransport(DatagramProtocol, AbstractTwistedTransport):
         else:
             try:
                 self.transport.write(outgoingMessage, transportAddress)
-            except Exception:
-                raise error.CarrierError('Twisted exception: %s' % (sys.exc_info()[1],))
+            except Exception as exc:
+                raise error.CarrierError('Twisted exception: %s' % exc)
diff --git a/pysnmp/carrier/twisted/dgram/udp.py b/pysnmp/carrier/twisted/dgram/udp.py
index ac0f23f1..bdb93cdd 100644
--- a/pysnmp/carrier/twisted/dgram/udp.py
+++ b/pysnmp/carrier/twisted/dgram/udp.py
@@ -28,15 +28,15 @@ class UdpTwistedTransport(DgramTwistedTransport):
             iface = ('', 0)
         try:
             self._lport = reactor.listenUDP(iface[1], self, iface[0])
-        except Exception:
-            raise error.CarrierError(sys.exc_info()[1])
+        except Exception as exc:
+            raise error.CarrierError(exc)
         return self
 
     def openServerMode(self, iface):
         try:
             self._lport = reactor.listenUDP(iface[1], self, iface[0])
-        except Exception:
-            raise error.CarrierError(sys.exc_info()[1])
+        except Exception as exc:
+            raise error.CarrierError(exc)
         return self
 
     def closeTransport(self):
diff --git a/pysnmp/carrier/twisted/dgram/unix.py b/pysnmp/carrier/twisted/dgram/unix.py
index a256969c..fe9c459b 100644
--- a/pysnmp/carrier/twisted/dgram/unix.py
+++ b/pysnmp/carrier/twisted/dgram/unix.py
@@ -24,15 +24,15 @@ class UnixTwistedTransport(DgramTwistedTransport):
     def openClientMode(self, iface=''):
         try:
             self._lport = reactor.connectUNIXDatagram(iface, self)
-        except Exception:
-            raise error.CarrierError(sys.exc_info()[1])
+        except Exception as exc:
+            raise error.CarrierError(exc)
         return self
 
     def openServerMode(self, iface):
         try:
             self._lport = reactor.listenUNIXDatagram(iface, self)
-        except Exception:
-            raise error.CarrierError(sys.exc_info()[1])
+        except Exception as exc:
+            raise error.CarrierError(exc)
 
         return self