summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/simple_task_queue/worker.py2
-rwxr-xr-xextra/release/bump_version.py2
-rw-r--r--funtests/transport.py2
-rw-r--r--kombu/connection.py6
-rw-r--r--kombu/messaging.py2
-rw-r--r--kombu/pidbox.py2
-rw-r--r--kombu/tests/transport/virtual/test_base.py2
-rw-r--r--kombu/transport/SQS.py2
-rw-r--r--kombu/transport/amqplib.py6
-rw-r--r--kombu/transport/base.py4
-rw-r--r--kombu/transport/mongodb.py2
-rw-r--r--kombu/transport/virtual/__init__.py2
-rw-r--r--kombu/transport/zmq.py10
-rw-r--r--kombu/utils/__init__.py2
-rw-r--r--kombu/utils/eventio.py6
15 files changed, 26 insertions, 26 deletions
diff --git a/examples/simple_task_queue/worker.py b/examples/simple_task_queue/worker.py
index d9fb691c..807542e9 100644
--- a/examples/simple_task_queue/worker.py
+++ b/examples/simple_task_queue/worker.py
@@ -23,7 +23,7 @@ class Worker(ConsumerMixin):
logger.info('Got task: %s', reprcall(fun.__name__, args, kwargs))
try:
fun(*args, **kwdict(kwargs))
- except Exception, exc:
+ except Exception as exc:
logger.error('task raised exception: %r', exc)
message.ack()
diff --git a/extra/release/bump_version.py b/extra/release/bump_version.py
index 24d0ebcb..d9dab464 100755
--- a/extra/release/bump_version.py
+++ b/extra/release/bump_version.py
@@ -21,7 +21,7 @@ def cmd(*args):
def no_enoent():
try:
yield
- except OSError, exc:
+ except OSError as exc:
if exc.errno != errno.ENOENT:
raise
diff --git a/funtests/transport.py b/funtests/transport.py
index f6ae1e17..1b4e65ef 100644
--- a/funtests/transport.py
+++ b/funtests/transport.py
@@ -79,7 +79,7 @@ class TransportCase(unittest.TestCase):
if self.transport:
try:
self.before_connect()
- except SkipTest, exc:
+ except SkipTest as exc:
self.skip_test_reason = str(exc)
else:
self.do_connect()
diff --git a/kombu/connection.py b/kombu/connection.py
index f8c9ef74..47857840 100644
--- a/kombu/connection.py
+++ b/kombu/connection.py
@@ -291,7 +291,7 @@ class Connection(object):
except socket.timeout:
self.more_to_read = False
return False
- except socket.error, exc:
+ except socket.error as exc:
if exc.errno in (errno.EAGAIN, errno.EINTR):
self.more_to_read = False
return False
@@ -426,7 +426,7 @@ class Connection(object):
for retries in count(0): # for infinity
try:
return fun(*args, **kwargs)
- except self.recoverable_connection_errors, exc:
+ except self.recoverable_connection_errors as exc:
if got_connection:
raise
if max_retries is not None and retries > max_retries:
@@ -449,7 +449,7 @@ class Connection(object):
if on_revive:
on_revive(new_channel)
got_connection += 1
- except self.recoverable_channel_errors, exc:
+ except self.recoverable_channel_errors as exc:
if max_retries is not None and retries > max_retries:
raise
self._debug('ensure channel error: %r', exc, exc_info=1)
diff --git a/kombu/messaging.py b/kombu/messaging.py
index e39625a3..c1e0f7de 100644
--- a/kombu/messaging.py
+++ b/kombu/messaging.py
@@ -538,7 +538,7 @@ class Consumer(object):
if m2p:
message = m2p(message)
decoded = None if on_m else message.decode()
- except Exception, exc:
+ except Exception as exc:
if not self.on_decode_error:
raise
self.on_decode_error(message, exc)
diff --git a/kombu/pidbox.py b/kombu/pidbox.py
index 7349d965..ed3aee54 100644
--- a/kombu/pidbox.py
+++ b/kombu/pidbox.py
@@ -79,7 +79,7 @@ class Node(object):
reply = handle(method, kwdict(arguments))
except SystemExit:
raise
- except Exception, exc:
+ except Exception as exc:
reply = {'error': repr(exc)}
if reply_to:
diff --git a/kombu/tests/transport/virtual/test_base.py b/kombu/tests/transport/virtual/test_base.py
index 28714cc4..e219198f 100644
--- a/kombu/tests/transport/virtual/test_base.py
+++ b/kombu/tests/transport/virtual/test_base.py
@@ -380,7 +380,7 @@ class test_Channel(TestCase):
exc = None
try:
raise KeyError()
- except KeyError, exc_:
+ except KeyError as exc_:
exc = exc_
ru.return_value = [(exc, 1)]
diff --git a/kombu/transport/SQS.py b/kombu/transport/SQS.py
index 9432ba12..a86d3a50 100644
--- a/kombu/transport/SQS.py
+++ b/kombu/transport/SQS.py
@@ -280,7 +280,7 @@ class Channel(virtual.Channel):
if conn:
try:
conn.close()
- except AttributeError, exc: # FIXME ???
+ except AttributeError as exc: # FIXME ???
if "can't set attribute" not in str(exc):
raise
diff --git a/kombu/transport/amqplib.py b/kombu/transport/amqplib.py
index 9e72523b..99d4de65 100644
--- a/kombu/transport/amqplib.py
+++ b/kombu/transport/amqplib.py
@@ -56,7 +56,7 @@ class TCPTransport(transport.TCPTransport):
while len(self._read_buffer) < n:
try:
s = self.sock.recv(65536)
- except socket.error, exc:
+ except socket.error as exc:
if not initial and exc.errno in (errno.EAGAIN, errno.EINTR):
continue
raise
@@ -105,7 +105,7 @@ class SSLTransport(transport.SSLTransport):
while len(result) < n:
try:
s = self.sslobj.read(n - len(result))
- except socket.error, exc:
+ except socket.error as exc:
if not initial and exc.errno in (errno.EAGAIN, errno.EINTR):
continue
raise
@@ -189,7 +189,7 @@ class Connection(amqp.Connection): # pragma: no cover
try:
try:
return self.method_reader.read_method()
- except SSLError, exc:
+ except SSLError as exc:
# http://bugs.python.org/issue10272
if 'timed out' in str(exc):
raise socket.timeout()
diff --git a/kombu/transport/base.py b/kombu/transport/base.py
index cd393463..40fcd64c 100644
--- a/kombu/transport/base.py
+++ b/kombu/transport/base.py
@@ -103,14 +103,14 @@ class Message(object):
def ack_log_error(self, logger, errors):
try:
self.ack()
- except errors, exc:
+ except errors as exc:
logger.critical("Couldn't ack %r, reason:%r",
self.delivery_tag, exc, exc_info=True)
def reject_log_error(self, logger, errors):
try:
self.reject()
- except errors, exc:
+ except errors as exc:
logger.critical("Couldn't ack %r, reason: %r",
self.delivery_tag, exc, exc_info=True)
diff --git a/kombu/transport/mongodb.py b/kombu/transport/mongodb.py
index a53aa15f..758c96c2 100644
--- a/kombu/transport/mongodb.py
+++ b/kombu/transport/mongodb.py
@@ -57,7 +57,7 @@ class Channel(virtual.Channel):
query={'queue': queue},
sort={'_id': pymongo.ASCENDING}, remove=True,
)
- except errors.OperationFailure, exc:
+ except errors.OperationFailure as exc:
if 'No matching object found' in exc.args[0]:
raise Empty()
raise
diff --git a/kombu/transport/virtual/__init__.py b/kombu/transport/virtual/__init__.py
index b9012a2d..62d684ae 100644
--- a/kombu/transport/virtual/__init__.py
+++ b/kombu/transport/virtual/__init__.py
@@ -173,7 +173,7 @@ class QoS(object):
try:
self.channel._restore(message)
- except BaseException, exc:
+ except BaseException as exc:
errors.append((exc, message))
delivered.clear()
return errors
diff --git a/kombu/transport/zmq.py b/kombu/transport/zmq.py
index b82772c2..e7a78f97 100644
--- a/kombu/transport/zmq.py
+++ b/kombu/transport/zmq.py
@@ -138,8 +138,8 @@ class Client(object):
def get(self, queue=None, timeout=None):
try:
return self.sink.recv(flags=zmq.NOBLOCK)
- except ZMQError, e:
- if e.errno == zmq.EAGAIN:
+ except ZMQError as exc:
+ if exc.errno == zmq.EAGAIN:
raise socket.error(errno.EAGAIN, e.strerror)
else:
raise
@@ -186,7 +186,7 @@ class Channel(virtual.Channel):
def _get(self, queue, timeout=None):
try:
return loads(self.client.get(queue, timeout))
- except socket.error, exc:
+ except socket.error as exc:
if exc.errno == errno.EAGAIN and timeout != 0:
raise Empty()
else:
@@ -268,8 +268,8 @@ class Transport(virtual.Transport):
for channel in connection.channels:
try:
evt = channel.cycle.get(timeout=timeout)
- except socket.error, e:
- if e.errno == errno.EAGAIN:
+ except socket.error as exc:
+ if exc.errno == errno.EAGAIN:
continue
raise
else:
diff --git a/kombu/utils/__init__.py b/kombu/utils/__init__.py
index 1e3517f8..64e08df5 100644
--- a/kombu/utils/__init__.py
+++ b/kombu/utils/__init__.py
@@ -218,7 +218,7 @@ def retry_over_time(fun, catch, args=[], kwargs={}, errback=None,
for retries in count():
try:
return fun(*args, **kwargs)
- except catch, exc:
+ except catch as exc:
if max_retries is not None and retries > max_retries:
raise
if callback:
diff --git a/kombu/utils/eventio.py b/kombu/utils/eventio.py
index c1632e14..773e5b95 100644
--- a/kombu/utils/eventio.py
+++ b/kombu/utils/eventio.py
@@ -70,7 +70,7 @@ class Poller(object):
def poll(self, timeout):
try:
return self._poll(timeout)
- except Exception, exc:
+ except Exception as exc:
if get_errno(exc) != errno.EINTR:
raise
@@ -83,7 +83,7 @@ class _epoll(Poller):
def register(self, fd, events):
try:
self._epoll.register(fd, events)
- except Exception, exc:
+ except Exception as exc:
if get_errno(exc) != errno.EEXIST:
raise
@@ -94,7 +94,7 @@ class _epoll(Poller):
pass
except ValueError:
pass
- except IOError, exc:
+ except IOError as exc:
if get_errno(exc) != errno.ENOENT:
raise
View Lorry Controller Status