2 files changed, 52 insertions, 44 deletions
diff --git a/python/examples/api/drain b/python/examples/api/drain
index a852d29de7..f2d7a50058 100755
--- a/python/examples/api/drain
+++ b/python/examples/api/drain
@@ -73,26 +73,30 @@ class Formatter:
     return eval(st, self.environ)
 
 # XXX: should make URL default the port for us
-conn = Connection.open(url.host, url.port or AMQP_PORT,
-                       username=url.user,
-                       password=url.password,
-                       reconnect=opts.reconnect,
-                       reconnect_delay=opts.reconnect_delay,
-                       reconnect_limit=opts.reconnect_limit)
-ssn = conn.session()
-rcv = ssn.receiver(addr)
+conn = Connection(url.host, url.port or AMQP_PORT,
+                  username=url.user,
+                  password=url.password,
+                  reconnect=opts.reconnect,
+                  reconnect_delay=opts.reconnect_delay,
+                  reconnect_limit=opts.reconnect_limit)
+try:
+  conn.connect()
+  ssn = conn.session()
+  rcv = ssn.receiver(addr)
 
-count = 0
-while not opts.count or count < opts.count:
-  try:
-    msg = rcv.fetch(timeout=timeout)
-    print opts.format % Formatter(msg)
-    count += 1
-    ssn.acknowledge()
-  except Empty:
-    break
-  except ReceiveError, e:
-    print e
-    break
+  count = 0
+  while not opts.count or count < opts.count:
+    try:
+      msg = rcv.fetch(timeout=timeout)
+      print opts.format % Formatter(msg)
+      count += 1
+      ssn.acknowledge()
+    except Empty:
+      break
+    except ReceiveError, e:
+      print e
+      break
+except KeyboardInterrupt:
+  pass
 
 conn.close()
diff --git a/python/examples/api/spout b/python/examples/api/spout
index ad98c486fd..97cb540c21 100755
--- a/python/examples/api/spout
+++ b/python/examples/api/spout
@@ -92,31 +92,35 @@ else:
   content = text
 
 # XXX: should make URL default the port for us
-conn = Connection.open(url.host, url.port or AMQP_PORT,
-                       username=url.user,
-                       password=url.password,
-                       reconnect=opts.reconnect,
-                       reconnect_delay=opts.reconnect_delay,
-                       reconnect_limit=opts.reconnect_limit)
-ssn = conn.session()
-snd = ssn.sender(addr)
+conn = Connection(url.host, url.port or AMQP_PORT,
+                  username=url.user,
+                  password=url.password,
+                  reconnect=opts.reconnect,
+                  reconnect_delay=opts.reconnect_delay,
+                  reconnect_limit=opts.reconnect_limit)
+try:
+  conn.connect()
+  ssn = conn.session()
+  snd = ssn.sender(addr)
 
-count = 0
-start = time.time()
-while (opts.count == 0 or count < opts.count) and \
-      (opts.timeout is None or time.time() - start < opts.timeout):
-  msg = Message(content, reply_to=opts.reply_to)
-  msg.properties["spout-id"] = "%s:%s" % (spout_id, count)
-  for p in opts.properties:
-    name, val = nameval(p)
-    msg.properties[name] = val
+  count = 0
+  start = time.time()
+  while (opts.count == 0 or count < opts.count) and \
+        (opts.timeout is None or time.time() - start < opts.timeout):
+    msg = Message(content, reply_to=opts.reply_to)
+    msg.properties["spout-id"] = "%s:%s" % (spout_id, count)
+    for p in opts.properties:
+      name, val = nameval(p)
+      msg.properties[name] = val
 
-  try:
-    snd.send(msg)
-    count += 1
-    print msg
-  except SendError, e:
-    print e
-    break
+    try:
+      snd.send(msg)
+      count += 1
+      print msg
+    except SendError, e:
+      print e
+      break
+except KeyboardInterrupt:
+  pass
 
 conn.close()