You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rh...@apache.org on 2015/02/13 17:07:32 UTC

qpid-proton git commit: proton.reactors -> proton.reactor

Repository: qpid-proton
Updated Branches:
  refs/heads/master 4b53bfca0 -> 566baf1e0


proton.reactors -> proton.reactor


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/566baf1e
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/566baf1e
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/566baf1e

Branch: refs/heads/master
Commit: 566baf1e0cc576ffae44bacd0bc8cb4d8272b003
Parents: 4b53bfc
Author: Rafael Schloming <rh...@alum.mit.edu>
Authored: Fri Feb 13 11:06:08 2015 -0500
Committer: Rafael Schloming <rh...@alum.mit.edu>
Committed: Fri Feb 13 11:06:08 2015 -0500

----------------------------------------------------------------------
 examples/engine/py/client.py                  |   2 +-
 examples/engine/py/db_recv.py                 |   2 +-
 examples/engine/py/db_send.py                 |   2 +-
 examples/engine/py/helloworld.py              |   2 +-
 examples/engine/py/helloworld_direct.py       |   2 +-
 examples/engine/py/proton_server.py           |   2 +-
 examples/engine/py/proton_tornado.py          |   2 +-
 examples/engine/py/recurring_timer.py         |   2 +-
 examples/engine/py/recurring_timer_tornado.py |   2 +-
 examples/engine/py/selected_recv.py           |   2 +-
 examples/engine/py/server.py                  |   2 +-
 examples/engine/py/server_direct.py           |   2 +-
 examples/engine/py/server_tx.py               |   2 +-
 examples/engine/py/simple_recv.py             |   2 +-
 examples/engine/py/simple_send.py             |   2 +-
 examples/engine/py/tx_recv.py                 |   2 +-
 examples/engine/py/tx_recv_interactive.py     |   2 +-
 examples/engine/py/tx_send.py                 |   2 +-
 examples/reactor/py/cat.py                    |   2 +-
 examples/reactor/py/count-randomly.py         |   2 +-
 examples/reactor/py/counter.py                |   2 +-
 examples/reactor/py/delegates.py              |   2 +-
 examples/reactor/py/echo.py                   |   2 +-
 examples/reactor/py/global-logger.py          |   2 +-
 examples/reactor/py/goodbye-world.py          |   2 +-
 examples/reactor/py/handlers.py               |   2 +-
 examples/reactor/py/hello-world.py            |   2 +-
 examples/reactor/py/reactor-logger.py         |   2 +-
 examples/reactor/py/recv.py                   |   2 +-
 examples/reactor/py/scheduling.py             |   2 +-
 examples/reactor/py/send.py                   |   2 +-
 examples/reactor/py/tornado_app.py            |   2 +-
 examples/reactor/py/unhandled.py              |   2 +-
 proton-c/bindings/python/CMakeLists.txt       |   2 +-
 proton-c/bindings/python/proton/__init__.py   |  16 +-
 proton-c/bindings/python/proton/reactor.py    | 703 +++++++++++++++++++++
 proton-c/bindings/python/proton/reactors.py   | 703 ---------------------
 proton-c/bindings/python/proton/utils.py      |   2 +-
 tests/python/proton_tests/common.py           |   2 +-
 tests/python/proton_tests/engine.py           |   2 +-
 tests/python/proton_tests/reactor.py          |   2 +-
 tests/python/proton_tests/utils.py            |   2 +-
 42 files changed, 750 insertions(+), 750 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/client.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/client.py b/examples/engine/py/client.py
index 5c00796..a116175 100755
--- a/examples/engine/py/client.py
+++ b/examples/engine/py/client.py
@@ -21,7 +21,7 @@
 import optparse
 from proton import Message
 from proton.handlers import MessagingHandler
-from proton.reactors import Container, DynamicNodeProperties
+from proton.reactor import Container, DynamicNodeProperties
 
 class Client(MessagingHandler):
     def __init__(self, url, requests):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/db_recv.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/db_recv.py b/examples/engine/py/db_recv.py
index 15170ee..3be2dc7 100755
--- a/examples/engine/py/db_recv.py
+++ b/examples/engine/py/db_recv.py
@@ -20,7 +20,7 @@
 
 import optparse
 from proton.handlers import MessagingHandler
-from proton.reactors import ApplicationEvent, Container
+from proton.reactor import ApplicationEvent, Container
 from db_common import Db
 
 class Recv(MessagingHandler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/db_send.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/db_send.py b/examples/engine/py/db_send.py
index c2e3fc2..29d64dd 100755
--- a/examples/engine/py/db_send.py
+++ b/examples/engine/py/db_send.py
@@ -23,7 +23,7 @@ import Queue
 import time
 from proton import Message
 from proton.handlers import MessagingHandler
-from proton.reactors import ApplicationEvent, Container
+from proton.reactor import ApplicationEvent, Container
 from db_common import Db
 
 class Send(MessagingHandler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/helloworld.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/helloworld.py b/examples/engine/py/helloworld.py
index e1ea2ee..d741f5e 100755
--- a/examples/engine/py/helloworld.py
+++ b/examples/engine/py/helloworld.py
@@ -20,7 +20,7 @@
 
 from proton import Message
 from proton.handlers import MessagingHandler
-from proton.reactors import Container
+from proton.reactor import Container
 
 class HelloWorld(MessagingHandler):
     def __init__(self, server, address):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/helloworld_direct.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/helloworld_direct.py b/examples/engine/py/helloworld_direct.py
index 6b5cb2e..2ad78a7 100755
--- a/examples/engine/py/helloworld_direct.py
+++ b/examples/engine/py/helloworld_direct.py
@@ -20,7 +20,7 @@
 
 from proton import Message
 from proton.handlers import MessagingHandler
-from proton.reactors import Container
+from proton.reactor import Container
 
 class HelloWorld(MessagingHandler):
     def __init__(self, url):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/proton_server.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/proton_server.py b/examples/engine/py/proton_server.py
index 8a5077b..b92261c 100755
--- a/examples/engine/py/proton_server.py
+++ b/examples/engine/py/proton_server.py
@@ -18,7 +18,7 @@
 #
 
 from proton import Message
-from proton.reactors import Container
+from proton.reactor import Container
 from proton.handlers import MessagingHandler
 
 class Server(MessagingHandler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/proton_tornado.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/proton_tornado.py b/examples/engine/py/proton_tornado.py
index d4afeba..f946b43 100755
--- a/examples/engine/py/proton_tornado.py
+++ b/examples/engine/py/proton_tornado.py
@@ -19,7 +19,7 @@
 #
 
 import tornado.ioloop
-from proton.reactors import Container as BaseContainer
+from proton.reactor import Container as BaseContainer
 from proton.handlers import IOHandler
 
 class TornadoLoopHandler:

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/recurring_timer.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/recurring_timer.py b/examples/engine/py/recurring_timer.py
index c8d5acf..a39791d 100755
--- a/examples/engine/py/recurring_timer.py
+++ b/examples/engine/py/recurring_timer.py
@@ -18,7 +18,7 @@
 # under the License.
 #
 
-from proton.reactors import Container, Handler
+from proton.reactor import Container, Handler
 
 class Recurring(Handler):
     def __init__(self, period):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/recurring_timer_tornado.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/recurring_timer_tornado.py b/examples/engine/py/recurring_timer_tornado.py
index aeeb20c..1f1c0e7 100755
--- a/examples/engine/py/recurring_timer_tornado.py
+++ b/examples/engine/py/recurring_timer_tornado.py
@@ -19,7 +19,7 @@
 #
 
 import time
-from proton.reactors import Handler
+from proton.reactor import Handler
 from proton_tornado import TornadoLoop
 
 class Recurring(Handler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/selected_recv.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/selected_recv.py b/examples/engine/py/selected_recv.py
index d0df3b5..351d4ef 100755
--- a/examples/engine/py/selected_recv.py
+++ b/examples/engine/py/selected_recv.py
@@ -18,7 +18,7 @@
 # under the License.
 #
 
-from proton.reactors import Container, Selector
+from proton.reactor import Container, Selector
 from proton.handlers import MessagingHandler
 
 class Recv(MessagingHandler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/server.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/server.py b/examples/engine/py/server.py
index 5326fa0..fc9ac8d 100755
--- a/examples/engine/py/server.py
+++ b/examples/engine/py/server.py
@@ -20,7 +20,7 @@
 
 from proton import Message
 from proton.handlers import MessagingHandler
-from proton.reactors import Container
+from proton.reactor import Container
 
 class Server(MessagingHandler):
     def __init__(self, host, address):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/server_direct.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/server_direct.py b/examples/engine/py/server_direct.py
index 6e1b830..605c755 100755
--- a/examples/engine/py/server_direct.py
+++ b/examples/engine/py/server_direct.py
@@ -20,7 +20,7 @@
 
 from proton import generate_uuid, Message
 from proton.handlers import MessagingHandler
-from proton.reactors import Container
+from proton.reactor import Container
 
 class Server(MessagingHandler):
     def __init__(self, url):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/server_tx.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/server_tx.py b/examples/engine/py/server_tx.py
index 02929fa..4a245e2 100755
--- a/examples/engine/py/server_tx.py
+++ b/examples/engine/py/server_tx.py
@@ -19,7 +19,7 @@
 #
 
 from proton import Message
-from proton.reactors import Container
+from proton.reactor import Container
 from proton.handlers import MessagingHandler, TransactionHandler
 
 class TxRequest(TransactionHandler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/simple_recv.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/simple_recv.py b/examples/engine/py/simple_recv.py
index 04d6f34..2e42819 100755
--- a/examples/engine/py/simple_recv.py
+++ b/examples/engine/py/simple_recv.py
@@ -20,7 +20,7 @@
 
 import optparse
 from proton.handlers import MessagingHandler
-from proton.reactors import Container
+from proton.reactor import Container
 
 class Recv(MessagingHandler):
     def __init__(self, url, count):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/simple_send.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/simple_send.py b/examples/engine/py/simple_send.py
index 40adc8d..551041c 100755
--- a/examples/engine/py/simple_send.py
+++ b/examples/engine/py/simple_send.py
@@ -21,7 +21,7 @@
 import optparse
 from proton import Message
 from proton.handlers import MessagingHandler
-from proton.reactors import Container
+from proton.reactor import Container
 
 class Send(MessagingHandler):
     def __init__(self, url, messages):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/tx_recv.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/tx_recv.py b/examples/engine/py/tx_recv.py
index e034592..641f0a2 100755
--- a/examples/engine/py/tx_recv.py
+++ b/examples/engine/py/tx_recv.py
@@ -20,7 +20,7 @@
 
 import optparse
 from proton import Url
-from proton.reactors import Container
+from proton.reactor import Container
 from proton.handlers import MessagingHandler, TransactionHandler
 
 class TxRecv(MessagingHandler, TransactionHandler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/tx_recv_interactive.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/tx_recv_interactive.py b/examples/engine/py/tx_recv_interactive.py
index aa85c4e..d08ff2b 100755
--- a/examples/engine/py/tx_recv_interactive.py
+++ b/examples/engine/py/tx_recv_interactive.py
@@ -20,7 +20,7 @@
 
 import sys
 import threading
-from proton.reactors import ApplicationEvent, Container
+from proton.reactor import ApplicationEvent, Container
 from proton.handlers import MessagingHandler, TransactionHandler
 
 class TxRecv(MessagingHandler, TransactionHandler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/engine/py/tx_send.py
----------------------------------------------------------------------
diff --git a/examples/engine/py/tx_send.py b/examples/engine/py/tx_send.py
index f2eb246..8c5420d 100755
--- a/examples/engine/py/tx_send.py
+++ b/examples/engine/py/tx_send.py
@@ -20,7 +20,7 @@
 
 import optparse
 from proton import Message, Url
-from proton.reactors import Container
+from proton.reactor import Container
 from proton.handlers import MessagingHandler, TransactionHandler
 
 class TxSend(MessagingHandler, TransactionHandler):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/cat.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/cat.py b/examples/reactor/py/cat.py
index e3af19a..57f4515 100755
--- a/examples/reactor/py/cat.py
+++ b/examples/reactor/py/cat.py
@@ -19,7 +19,7 @@
 #
 
 import sys, os
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 class Echo:
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/count-randomly.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/count-randomly.py b/examples/reactor/py/count-randomly.py
index 9bcc41f..d9a32c6 100755
--- a/examples/reactor/py/count-randomly.py
+++ b/examples/reactor/py/count-randomly.py
@@ -19,7 +19,7 @@
 #
 
 import time, random
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 # Let's try to modify our counter example. In addition to counting to
 # 10 in quarter second intervals, let's also print out a random number

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/counter.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/counter.py b/examples/reactor/py/counter.py
index b1456c0..1ef45f0 100755
--- a/examples/reactor/py/counter.py
+++ b/examples/reactor/py/counter.py
@@ -19,7 +19,7 @@
 #
 
 import time
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 class Counter:
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/delegates.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/delegates.py b/examples/reactor/py/delegates.py
index b81338d..813ceba 100755
--- a/examples/reactor/py/delegates.py
+++ b/examples/reactor/py/delegates.py
@@ -19,7 +19,7 @@
 #
 
 import time
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 # Events know how to dispatch themselves to handlers. By combining
 # this with on_unhandled, you can provide a kind of inheritance

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/echo.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/echo.py b/examples/reactor/py/echo.py
index 66a163c..4675f5d 100755
--- a/examples/reactor/py/echo.py
+++ b/examples/reactor/py/echo.py
@@ -19,7 +19,7 @@
 #
 
 import sys, os
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 class Echo:
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/global-logger.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/global-logger.py b/examples/reactor/py/global-logger.py
index 828ae58..bc3bc56 100755
--- a/examples/reactor/py/global-logger.py
+++ b/examples/reactor/py/global-logger.py
@@ -19,7 +19,7 @@
 #
 
 import time
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 # Not every event goes to the reactor's event handler. If we have a
 # separate handler for something like a scheduled task, then those

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/goodbye-world.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/goodbye-world.py b/examples/reactor/py/goodbye-world.py
index a14525a..44bcf7c 100755
--- a/examples/reactor/py/goodbye-world.py
+++ b/examples/reactor/py/goodbye-world.py
@@ -18,7 +18,7 @@
 # under the License.
 #
 
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 # So far the reactive hello-world doesn't look too different from a
 # regular old non-reactive hello-world. The on_reactor_init method can

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/handlers.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/handlers.py b/examples/reactor/py/handlers.py
index 36f2c22..ed3a94d 100755
--- a/examples/reactor/py/handlers.py
+++ b/examples/reactor/py/handlers.py
@@ -19,7 +19,7 @@
 #
 
 import time
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 
 class World:

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/hello-world.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/hello-world.py b/examples/reactor/py/hello-world.py
index beff278..c685c73 100755
--- a/examples/reactor/py/hello-world.py
+++ b/examples/reactor/py/hello-world.py
@@ -18,7 +18,7 @@
 # under the License.
 #
 
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 # The proton reactor provides a general purpose event processing
 # library for writing reactive programs. A reactive program is defined

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/reactor-logger.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/reactor-logger.py b/examples/reactor/py/reactor-logger.py
index 932a3f7..c07e9b9 100755
--- a/examples/reactor/py/reactor-logger.py
+++ b/examples/reactor/py/reactor-logger.py
@@ -19,7 +19,7 @@
 #
 
 import time
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 class Logger:
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/recv.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/recv.py b/examples/reactor/py/recv.py
index a3e3479..aa56472 100755
--- a/examples/reactor/py/recv.py
+++ b/examples/reactor/py/recv.py
@@ -19,7 +19,7 @@
 #
 
 from proton import Message
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 from proton.handlers import CHandshaker, CFlowController
 
 class Program:

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/scheduling.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/scheduling.py b/examples/reactor/py/scheduling.py
index 04e9ed2..f822f68 100755
--- a/examples/reactor/py/scheduling.py
+++ b/examples/reactor/py/scheduling.py
@@ -19,7 +19,7 @@
 #
 
 import time
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 class Program:
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/send.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/send.py b/examples/reactor/py/send.py
index 7f1482b..7b95502 100755
--- a/examples/reactor/py/send.py
+++ b/examples/reactor/py/send.py
@@ -20,7 +20,7 @@
 
 import sys
 from proton import Message
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 from proton.handlers import CHandshaker
 
 # This is a send in terms of low level AMQP events. There are handlers

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/tornado_app.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/tornado_app.py b/examples/reactor/py/tornado_app.py
index 34c659a..966ac8b 100644
--- a/examples/reactor/py/tornado_app.py
+++ b/examples/reactor/py/tornado_app.py
@@ -19,7 +19,7 @@
 #
 
 import tornado.ioloop
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 from proton.handlers import IOHandler
 
 class TornadoApp:

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/examples/reactor/py/unhandled.py
----------------------------------------------------------------------
diff --git a/examples/reactor/py/unhandled.py b/examples/reactor/py/unhandled.py
index 8275c5e..3734a71 100755
--- a/examples/reactor/py/unhandled.py
+++ b/examples/reactor/py/unhandled.py
@@ -19,7 +19,7 @@
 #
 
 import time
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 class Program:
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/proton-c/bindings/python/CMakeLists.txt
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/CMakeLists.txt b/proton-c/bindings/python/CMakeLists.txt
index 3732081..70ac847 100644
--- a/proton-c/bindings/python/CMakeLists.txt
+++ b/proton-c/bindings/python/CMakeLists.txt
@@ -56,7 +56,7 @@ set (pysrc-generated cproton.py)
 set (pysrc
     proton/__init__.py
     proton/handlers.py
-    proton/reactors.py
+    proton/reactor.py
     proton/utils.py
     proton/wrapper.py
     )

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/proton-c/bindings/python/proton/__init__.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/__init__.py b/proton-c/bindings/python/proton/__init__.py
index 743eafa..c3745ae 100644
--- a/proton-c/bindings/python/proton/__init__.py
+++ b/proton-c/bindings/python/proton/__init__.py
@@ -2244,20 +2244,20 @@ class Endpoint(object):
       assert False, "Subclass must override this!"
 
   def _get_handler(self):
-    import reactors
-    reactor = reactors.Reactor.wrap(pn_object_reactor(self._impl))
-    if reactor:
-      on_error = reactor.on_error
+    import reactor
+    ractor = reactor.Reactor.wrap(pn_object_reactor(self._impl))
+    if ractor:
+      on_error = ractor.on_error
     else:
       on_error = None
     record = self._get_attachments()
     return WrappedHandler.wrap(pn_record_get_handler(record), on_error)
 
   def _set_handler(self, handler):
-    import reactors
-    reactor = reactors.Reactor.wrap(pn_object_reactor(self._impl))
-    if reactor:
-      on_error = reactor.on_error
+    import reactor
+    ractor = reactor.Reactor.wrap(pn_object_reactor(self._impl))
+    if ractor:
+      on_error = ractor.on_error
     else:
       on_error = None
     impl = _chandler(handler, on_error)

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/proton-c/bindings/python/proton/reactor.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/reactor.py b/proton-c/bindings/python/proton/reactor.py
new file mode 100644
index 0000000..e07c4a4
--- /dev/null
+++ b/proton-c/bindings/python/proton/reactor.py
@@ -0,0 +1,703 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+#
+import logging, os, Queue, socket, time, types
+from heapq import heappush, heappop, nsmallest
+from proton import Collector, Connection, ConnectionException, Delivery, Described, dispatch
+from proton import Endpoint, Event, EventBase, EventType, generate_uuid, Handler, Link, Message
+from proton import ProtonException, PN_ACCEPTED, PN_PYREF, SASL, Session, SSL, SSLDomain, symbol
+from proton import Terminus, Timeout, Transport, TransportException, ulong, Url
+from select import select
+from proton.handlers import OutgoingMessageHandler, ScopedHandler
+from proton import unicode2utf8, utf82unicode
+
+import traceback
+from proton import WrappedHandler, _chandler, secs2millis, millis2secs, Selectable
+from wrapper import Wrapper, PYCTX
+from cproton import *
+
+class Task(Wrapper):
+
+    @staticmethod
+    def wrap(impl):
+        if impl is None:
+            return None
+        else:
+            return Task(impl)
+
+    def __init__(self, impl):
+        Wrapper.__init__(self, impl, pn_task_attachments)
+
+    def _init(self):
+        pass
+
+class Acceptor(Wrapper):
+
+    def __init__(self, impl):
+        Wrapper.__init__(self, impl)
+
+    def close(self):
+        pn_acceptor_close(self._impl)
+
+class Reactor(Wrapper):
+
+    @staticmethod
+    def wrap(impl):
+        if impl is None:
+            return None
+        else:
+            record = pn_reactor_attachments(impl)
+            attrs = pn_void2py(pn_record_get(record, PYCTX))
+            if attrs and 'subclass' in attrs:
+                return attrs['subclass'](impl=impl)
+            else:
+                return Reactor(impl=impl)
+
+    def __init__(self, *handlers, **kwargs):
+        Wrapper.__init__(self, kwargs.get("impl", pn_reactor), pn_reactor_attachments)
+        for h in handlers:
+            self.handler.add(h)
+
+    def _init(self):
+        self.errors = []
+
+    def on_error(self, info):
+        self.errors.append(info)
+        self.yield_()
+
+    def _get_global(self):
+        return WrappedHandler.wrap(pn_reactor_get_global_handler(self._impl), self.on_error)
+
+    def _set_global(self, handler):
+        impl = _chandler(handler, self.on_error)
+        pn_reactor_set_global_handler(self._impl, impl)
+        pn_decref(impl)
+
+    global_handler = property(_get_global, _set_global)
+
+    def _get_timeout(self):
+        return millis2secs(pn_reactor_get_timeout(self._impl))
+
+    def _set_timeout(self, secs):
+        return pn_reactor_set_timeout(self._impl, secs2millis(secs))
+
+    timeout = property(_get_timeout, _set_timeout)
+
+    def yield_(self):
+        pn_reactor_yield(self._impl)
+
+    def mark(self):
+        pn_reactor_mark(self._impl)
+
+    def _get_handler(self):
+        return WrappedHandler.wrap(pn_reactor_get_handler(self._impl), self.on_error)
+
+    def _set_handler(self, handler):
+        impl = _chandler(handler, self.on_error)
+        pn_reactor_set_handler(self._impl, impl)
+        pn_decref(impl)
+
+    handler = property(_get_handler, _set_handler)
+
+    def run(self):
+        self.timeout = 3.14159265359
+        self.start()
+        while self.process(): pass
+        self.stop()
+
+    def wakeup(self):
+        n = pn_reactor_wakeup(self._impl)
+        if n: raise IOError(pn_error_text(pn_io_error(pn_reactor_io(self._impl))))
+
+    def start(self):
+        pn_reactor_start(self._impl)
+
+    @property
+    def quiesced(self):
+        return pn_reactor_quiesced(self._impl)
+
+    def process(self):
+        result = pn_reactor_process(self._impl)
+        if self.errors:
+            for exc, value, tb in self.errors[:-1]:
+                traceback.print_exception(exc, value, tb)
+            exc, value, tb = self.errors[-1]
+            raise exc, value, tb
+        return result
+
+    def stop(self):
+        pn_reactor_stop(self._impl)
+
+    def schedule(self, delay, task):
+        impl = _chandler(task, self.on_error)
+        task = Task.wrap(pn_reactor_schedule(self._impl, secs2millis(delay), impl))
+        pn_decref(impl)
+        return task
+
+    def acceptor(self, host, port, handler=None):
+        impl = _chandler(handler, self.on_error)
+        aimpl = pn_reactor_acceptor(self._impl, unicode2utf8(host), str(port), impl)
+        pn_decref(impl)
+        if aimpl:
+            return Acceptor(aimpl)
+        else:
+            raise IOError("%s (%s:%s)" % (pn_error_text(pn_io_error(pn_reactor_io(self._impl))), host, port))
+
+    def connection(self, handler=None):
+        impl = _chandler(handler, self.on_error)
+        result = Connection.wrap(pn_reactor_connection(self._impl, impl))
+        pn_decref(impl)
+        return result
+
+    def selectable(self, handler=None):
+        impl = _chandler(handler, self.on_error)
+        result = Selectable.wrap(pn_reactor_selectable(self._impl))
+        if impl:
+            record = pn_selectable_attachments(result._impl)
+            pn_record_set_handler(record, impl)
+            pn_decref(impl)
+        return result
+
+    def update(self, sel):
+        pn_reactor_update(self._impl, sel._impl)
+
+    def push_event(self, obj, etype):
+        pn_collector_put(pn_reactor_collector(self._impl), PN_PYREF, pn_py2void(obj), etype.number)
+
+from proton import wrappers as _wrappers
+_wrappers["pn_reactor"] = lambda x: Reactor.wrap(pn_cast_pn_reactor(x))
+_wrappers["pn_task"] = lambda x: Task.wrap(pn_cast_pn_task(x))
+
+
+class EventInjector(object):
+    """
+    Can be added to an io loop to allow events to be triggered by an
+    external thread but handled on the event thread associated with
+    the loop.
+    """
+    def __init__(self):
+        self.queue = Queue.Queue()
+        self.pipe = os.pipe()
+        self._closed = False
+
+    def trigger(self, event):
+        self.queue.put(event)
+        os.write(self.pipe[1], "!")
+
+    def close(self):
+        self._closed = True
+        os.write(self.pipe[1], "!")
+
+    def fileno(self):
+        return self.pipe[0]
+
+    def on_selectable_init(self, event):
+        sel = event.context
+        sel.fileno(self.fileno())
+        sel.reading = True
+        event.reactor.update(sel)
+
+    def on_selectable_readable(self, event):
+        os.read(self.pipe[0], 512)
+        while not self.queue.empty():
+            requested = self.queue.get()
+            event.reactor.push_event(requested.context, requested.type)
+        if self._closed:
+            s = event.context
+            s.terminate()
+            event.reactor.update(s)
+
+
+class Names(object):
+    def __init__(self, base=10000):
+        self.names = []
+        self.base = base
+
+    def number(self, name):
+        if name not in self.names:
+            self.names.append(name)
+        return self.names.index(name) + self.base
+
+class ExtendedEventType(EventType):
+    USED = Names()
+    """
+    Event type identifier for events defined outside the proton-c
+    library
+    """
+    def __init__(self, name, number=None):
+        super(ExtendedEventType, self).__init__(number or ExtendedEventType.USED.number(name), "on_%s" % name)
+        self.name = name
+
+class ApplicationEvent(EventBase):
+    """
+    Application defined event, which can optionally be associated with
+    an engine object and or an arbitrary subject
+    """
+    def __init__(self, typename, connection=None, session=None, link=None, delivery=None, subject=None):
+        super(ApplicationEvent, self).__init__(PN_PYREF, self, ExtendedEventType(typename))
+        self.connection = connection
+        self.session = session
+        self.link = link
+        self.delivery = delivery
+        if self.delivery:
+            self.link = self.delivery.link
+        if self.link:
+            self.session = self.link.session
+        if self.session:
+            self.connection = self.session.connection
+        self.subject = subject
+
+    def __repr__(self):
+        objects = [self.connection, self.session, self.link, self.delivery, self.subject]
+        return "%s(%s)" % (typename, ", ".join([str(o) for o in objects if o is not None]))
+
+class StartEvent(ApplicationEvent):
+    def __init__(self, container):
+        super(StartEvent, self).__init__("start")
+        self.container = container
+
+
+class Transaction(object):
+    """
+    Class to track state of an AMQP 1.0 transaction.
+    """
+    def __init__(self, txn_ctrl, handler, settle_before_discharge=False):
+        self.txn_ctrl = txn_ctrl
+        self.handler = handler
+        self.id = None
+        self._declare = None
+        self._discharge = None
+        self.failed = False
+        self._pending = []
+        self.settle_before_discharge = settle_before_discharge
+        self.declare()
+
+    def commit(self):
+        self.discharge(False)
+
+    def abort(self):
+        self.discharge(True)
+
+    def declare(self):
+        self._declare = self._send_ctrl(symbol(u'amqp:declare:list'), [None])
+
+    def discharge(self, failed):
+        self.failed = failed
+        self._discharge = self._send_ctrl(symbol(u'amqp:discharge:list'), [self.id, failed])
+
+    def _send_ctrl(self, descriptor, value):
+        delivery = self.txn_ctrl.send(Message(body=Described(descriptor, value)))
+        delivery.transaction = self
+        return delivery
+
+    def send(self, sender, msg, tag=None):
+        dlv = sender.send(msg, tag=tag)
+        dlv.local.data = [self.id]
+        dlv.update(0x34)
+        return dlv
+
+    def accept(self, delivery):
+        self.update(delivery, PN_ACCEPTED)
+        if self.settle_before_discharge:
+            delivery.settle()
+        else:
+            self._pending.append(delivery)
+
+    def update(self, delivery, state=None):
+        if state:
+            delivery.local.data = [self.id, Described(ulong(state), [])]
+            delivery.update(0x34)
+
+    def _release_pending(self):
+        for d in self._pending:
+            d.update(Delivery.RELEASED)
+            d.settle()
+        self._clear_pending()
+
+    def _clear_pending(self):
+        self._pending = []
+
+    def handle_outcome(self, event):
+        if event.delivery == self._declare:
+            if event.delivery.remote.data:
+                self.id = event.delivery.remote.data[0]
+                self.handler.on_transaction_declared(event)
+            elif event.delivery.remote_state == Delivery.REJECTED:
+                self.handler.on_transaction_declare_failed(event)
+            else:
+                logging.warning("Unexpected outcome for declare: %s" % event.delivery.remote_state)
+                self.handler.on_transaction_declare_failed(event)
+        elif event.delivery == self._discharge:
+            if event.delivery.remote_state == Delivery.REJECTED:
+                if not self.failed:
+                    self.handler.on_transaction_commit_failed(event)
+                    self._release_pending() # make this optional?
+            else:
+                if self.failed:
+                    self.handler.on_transaction_aborted(event)
+                    self._release_pending()
+                else:
+                    self.handler.on_transaction_committed(event)
+            self._clear_pending()
+
+class LinkOption(object):
+    """
+    Abstract interface for link configuration options
+    """
+    def apply(self, link):
+        """
+        Subclasses will implement any configuration logic in this
+        method
+        """
+        pass
+    def test(self, link):
+        """
+        Subclasses can override this to selectively apply an option
+        e.g. based on some link criteria
+        """
+        return True
+
+class AtMostOnce(LinkOption):
+    def apply(self, link):
+        link.snd_settle_mode = Link.SND_SETTLED
+
+class AtLeastOnce(LinkOption):
+    def apply(self, link):
+        link.snd_settle_mode = Link.SND_UNSETTLED
+        link.rcv_settle_mode = Link.RCV_FIRST
+
+class SenderOption(LinkOption):
+    def apply(self, sender): pass
+    def test(self, link): return link.is_sender
+
+class ReceiverOption(LinkOption):
+    def apply(self, receiver): pass
+    def test(self, link): return link.is_receiver
+
+class DynamicNodeProperties(LinkOption):
+    def __init__(self, props={}):
+        self.properties = {}
+        for k in props:
+            if isinstance(k, symbol):
+                self.properties[k] = props[k]
+            else:
+                self.properties[symbol(k)] = props[k]
+
+    def apply(self, link):
+        if link.is_receiver:
+            link.source.properties.put_dict(self.properties)
+        else:
+            link.target.properties.put_dict(self.properties)
+
+class Filter(ReceiverOption):
+    def __init__(self, filter_set={}):
+        self.filter_set = filter_set
+
+    def apply(self, receiver):
+        receiver.source.filter.put_dict(self.filter_set)
+
+class Selector(Filter):
+    """
+    Configures a link with a message selector filter
+    """
+    def __init__(self, value, name='selector'):
+        super(Selector, self).__init__({symbol(name): Described(symbol('apache.org:selector-filter:string'), value)})
+
+def _apply_link_options(options, link):
+    if options:
+        if isinstance(options, list):
+            for o in options:
+                if o.test(link): o.apply(link)
+        else:
+            if options.test(link): options.apply(link)
+
+def _create_session(connection, handler=None):
+    session = connection.session()
+    session.open()
+    return session
+
+
+def _get_attr(target, name):
+    if hasattr(target, name):
+        return getattr(target, name)
+    else:
+        return None
+
+class SessionPerConnection(object):
+    def __init__(self):
+        self._default_session = None
+
+    def session(self, connection):
+        if not self._default_session:
+            self._default_session = _create_session(connection)
+            self._default_session.context = self
+        return self._default_session
+
+    def on_session_remote_close(self, event):
+        event.connection.close()
+        self._default_session = None
+
+class GlobalOverrides(object):
+    """
+    Internal handler that triggers the necessary socket connect for an
+    opened connection.
+    """
+    def __init__(self, base):
+        self.base = base
+
+    def on_unhandled(self, name, event):
+        if not self._override(event):
+            event.dispatch(self.base)
+
+    def _override(self, event):
+        conn = event.connection
+        return conn and hasattr(conn, '_overrides') and event.dispatch(conn._overrides)
+
+class Connector(Handler):
+    """
+    Internal handler that triggers the necessary socket connect for an
+    opened connection.
+    """
+    def __init__(self, connection):
+        self.connection = connection
+        self.address = None
+        self.heartbeat = None
+        self.reconnect = None
+        self.ssl_domain = None
+
+    def _connect(self, connection):
+        url = self.address.next()
+        # IoHandler uses the hostname to determine where to try to connect to
+        connection.hostname = "%s:%i" % (url.host, url.port)
+        logging.info("connecting to %s..." % connection.hostname)
+
+        transport = Transport()
+        transport.bind(connection)
+        if self.heartbeat:
+            transport.idle_timeout = self.heartbeat
+        if url.scheme == 'amqps' and self.ssl_domain:
+            self.ssl = SSL(transport, self.ssl_domain)
+            self.ssl.peer_hostname = url.host
+        if url.username:
+            sasl = transport.sasl()
+            if url.username == 'anonymous':
+                sasl.mechanisms('ANONYMOUS')
+            else:
+                sasl.plain(url.username, url.password)
+
+    def on_connection_local_open(self, event):
+        self._connect(event.connection)
+
+    def on_connection_remote_open(self, event):
+        logging.info("connected to %s" % event.connection.hostname)
+        if self.reconnect:
+            self.reconnect.reset()
+            self.transport = None
+
+    def on_transport_tail_closed(self, event):
+        self.on_transport_closed(event)
+
+    def on_transport_closed(self, event):
+        if self.connection and self.connection.state & Endpoint.LOCAL_ACTIVE:
+            if self.reconnect:
+                event.transport.unbind()
+                delay = self.reconnect.next()
+                if delay == 0:
+                    logging.info("Disconnected, reconnecting...")
+                    self._connect(self.connection)
+                else:
+                    logging.info("Disconnected will try to reconnect after %s seconds" % delay)
+                    event.reactor.schedule(delay, self)
+            else:
+                logging.info("Disconnected")
+                self.connection = None
+
+    def on_timer_task(self, event):
+        self._connect(self.connection)
+
+    def on_connection_remote_close(self, event):
+        self.connection = None
+
+class Backoff(object):
+    """
+    A reconnect strategy involving an increasing delay between
+    retries, up to a maximum or 10 seconds.
+    """
+    def __init__(self):
+        self.delay = 0
+
+    def reset(self):
+        self.delay = 0
+
+    def next(self):
+        current = self.delay
+        if current == 0:
+            self.delay = 0.1
+        else:
+            self.delay = min(10, 2*current)
+        return current
+
+class Urls(object):
+    def __init__(self, values):
+        self.values = [Url(v) for v in values]
+        self.i = iter(self.values)
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        try:
+            return self.i.next()
+        except StopIteration:
+            self.i = iter(self.values)
+            return self.i.next()
+
+class SSLConfig(object):
+    def __init__(self):
+        self.client = SSLDomain(SSLDomain.MODE_CLIENT)
+        self.server = SSLDomain(SSLDomain.MODE_SERVER)
+
+    def set_credentials(self, cert_file, key_file, password):
+        self.client.set_credentials(cert_file, key_file, password)
+        self.server.set_credentials(cert_file, key_file, password)
+
+    def set_trusted_ca_db(self, certificate_db):
+        self.client.set_trusted_ca_db(certificate_db)
+        self.server.set_trusted_ca_db(certificate_db)
+
+
+class Container(Reactor):
+    def __init__(self, *handlers, **kwargs):
+        super(Container, self).__init__(*handlers, **kwargs)
+        if "impl" not in kwargs:
+            self.ssl = SSLConfig()
+            self.global_handler = GlobalOverrides(kwargs.get('global_handler', self.global_handler))
+            self.trigger = None
+            self.container_id = str(generate_uuid())
+            Wrapper.__setattr__(self, 'subclass', self.__class__)
+
+    def connect(self, url=None, urls=None, address=None, handler=None, reconnect=None, heartbeat=None, ssl_domain=None):
+        conn = self.connection(handler)
+        conn.container = self.container_id or str(generate_uuid())
+
+        connector = Connector(conn)
+        conn._overrides = connector
+        if url: connector.address = Urls([url])
+        elif urls: connector.address = Urls(urls)
+        elif address: connector.address = address
+        else: raise ValueError("One of url, urls or address required")
+        if heartbeat:
+            connector.heartbeat = heartbeat
+        if reconnect:
+            connector.reconnect = reconnect
+        elif reconnect is None:
+            connector.reconnect = Backoff()
+        connector.ssl_domain = ssl_domain or self.ssl.client
+        conn._session_policy = SessionPerConnection() #todo: make configurable
+        conn.open()
+        return conn
+
+    def _get_id(self, container, remote, local):
+        if local and remote: "%s-%s-%s" % (container, remote, local)
+        elif local: return "%s-%s" % (container, local)
+        elif remote: return "%s-%s" % (container, remote)
+        else: return "%s-%s" % (container, str(generate_uuid()))
+
+    def _get_session(self, context):
+        if isinstance(context, Url):
+            return self._get_session(self.connect(url=context))
+        elif isinstance(context, Session):
+            return context
+        elif isinstance(context, Connection):
+            if hasattr(context, '_session_policy'):
+                return context._session_policy.session(context)
+            else:
+                return _create_session(context)
+        else:
+            return context.session()
+
+    def create_sender(self, context, target=None, source=None, name=None, handler=None, tags=None, options=None):
+        if isinstance(context, basestring):
+            context = Url(context)
+        if isinstance(context, Url) and not target:
+            target = context.path
+        session = self._get_session(context)
+        snd = session.sender(name or self._get_id(session.connection.container, target, source))
+        if source:
+            snd.source.address = source
+        if target:
+            snd.target.address = target
+        if handler:
+            snd.handler = handler
+        if tags:
+            snd.tag_generator = tags
+        _apply_link_options(options, snd)
+        snd.open()
+        return snd
+
+    def create_receiver(self, context, source=None, target=None, name=None, dynamic=False, handler=None, options=None):
+        if isinstance(context, basestring):
+            context = Url(context)
+        if isinstance(context, Url) and not source:
+            source = context.path
+        session = self._get_session(context)
+        rcv = session.receiver(name or self._get_id(session.connection.container, source, target))
+        if source:
+            rcv.source.address = source
+        if dynamic:
+            rcv.source.dynamic = True
+        if target:
+            rcv.target.address = target
+        if handler:
+            rcv.handler = handler
+        _apply_link_options(options, rcv)
+        rcv.open()
+        return rcv
+
+    def declare_transaction(self, context, handler=None, settle_before_discharge=False):
+        if not _get_attr(context, '_txn_ctrl'):
+            class InternalTransactionHandler(OutgoingMessageHandler):
+                def __init__(self):
+                    super(InternalTransactionHandler, self).__init__(auto_settle=True)
+
+                def on_settled(self, event):
+                    if hasattr(event.delivery, "transaction"):
+                        event.transaction = event.delivery.transaction
+                        event.delivery.transaction.handle_outcome(event)
+            context._txn_ctrl = self.create_sender(context, None, name='txn-ctrl', handler=InternalTransactionHandler())
+            context._txn_ctrl.target.type = Terminus.COORDINATOR
+            context._txn_ctrl.target.capabilities.put_object(symbol(u'amqp:local-transactions'))
+        return Transaction(context._txn_ctrl, handler, settle_before_discharge)
+
+    def listen(self, url, ssl_domain=None):
+        url = Url(url)
+        ssl_config = ssl_domain
+        if not ssl_config and url.scheme == 'amqps':
+            ssl_config = self.ssl_domain
+        return self.acceptor(url.host, url.port)
+
+    def get_event_trigger(self):
+        if not self.trigger or self.trigger.closed():
+            self.trigger = EventInjector()
+            self.selectable(self.trigger)
+        return self.trigger
+
+    def do_work(self, timeout=None):
+        if timeout:
+            self.timeout = timeout
+        return self.process()

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/proton-c/bindings/python/proton/reactors.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/reactors.py b/proton-c/bindings/python/proton/reactors.py
deleted file mode 100644
index e07c4a4..0000000
--- a/proton-c/bindings/python/proton/reactors.py
+++ /dev/null
@@ -1,703 +0,0 @@
-#
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#   http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied.  See the License for the
-# specific language governing permissions and limitations
-# under the License.
-#
-import logging, os, Queue, socket, time, types
-from heapq import heappush, heappop, nsmallest
-from proton import Collector, Connection, ConnectionException, Delivery, Described, dispatch
-from proton import Endpoint, Event, EventBase, EventType, generate_uuid, Handler, Link, Message
-from proton import ProtonException, PN_ACCEPTED, PN_PYREF, SASL, Session, SSL, SSLDomain, symbol
-from proton import Terminus, Timeout, Transport, TransportException, ulong, Url
-from select import select
-from proton.handlers import OutgoingMessageHandler, ScopedHandler
-from proton import unicode2utf8, utf82unicode
-
-import traceback
-from proton import WrappedHandler, _chandler, secs2millis, millis2secs, Selectable
-from wrapper import Wrapper, PYCTX
-from cproton import *
-
-class Task(Wrapper):
-
-    @staticmethod
-    def wrap(impl):
-        if impl is None:
-            return None
-        else:
-            return Task(impl)
-
-    def __init__(self, impl):
-        Wrapper.__init__(self, impl, pn_task_attachments)
-
-    def _init(self):
-        pass
-
-class Acceptor(Wrapper):
-
-    def __init__(self, impl):
-        Wrapper.__init__(self, impl)
-
-    def close(self):
-        pn_acceptor_close(self._impl)
-
-class Reactor(Wrapper):
-
-    @staticmethod
-    def wrap(impl):
-        if impl is None:
-            return None
-        else:
-            record = pn_reactor_attachments(impl)
-            attrs = pn_void2py(pn_record_get(record, PYCTX))
-            if attrs and 'subclass' in attrs:
-                return attrs['subclass'](impl=impl)
-            else:
-                return Reactor(impl=impl)
-
-    def __init__(self, *handlers, **kwargs):
-        Wrapper.__init__(self, kwargs.get("impl", pn_reactor), pn_reactor_attachments)
-        for h in handlers:
-            self.handler.add(h)
-
-    def _init(self):
-        self.errors = []
-
-    def on_error(self, info):
-        self.errors.append(info)
-        self.yield_()
-
-    def _get_global(self):
-        return WrappedHandler.wrap(pn_reactor_get_global_handler(self._impl), self.on_error)
-
-    def _set_global(self, handler):
-        impl = _chandler(handler, self.on_error)
-        pn_reactor_set_global_handler(self._impl, impl)
-        pn_decref(impl)
-
-    global_handler = property(_get_global, _set_global)
-
-    def _get_timeout(self):
-        return millis2secs(pn_reactor_get_timeout(self._impl))
-
-    def _set_timeout(self, secs):
-        return pn_reactor_set_timeout(self._impl, secs2millis(secs))
-
-    timeout = property(_get_timeout, _set_timeout)
-
-    def yield_(self):
-        pn_reactor_yield(self._impl)
-
-    def mark(self):
-        pn_reactor_mark(self._impl)
-
-    def _get_handler(self):
-        return WrappedHandler.wrap(pn_reactor_get_handler(self._impl), self.on_error)
-
-    def _set_handler(self, handler):
-        impl = _chandler(handler, self.on_error)
-        pn_reactor_set_handler(self._impl, impl)
-        pn_decref(impl)
-
-    handler = property(_get_handler, _set_handler)
-
-    def run(self):
-        self.timeout = 3.14159265359
-        self.start()
-        while self.process(): pass
-        self.stop()
-
-    def wakeup(self):
-        n = pn_reactor_wakeup(self._impl)
-        if n: raise IOError(pn_error_text(pn_io_error(pn_reactor_io(self._impl))))
-
-    def start(self):
-        pn_reactor_start(self._impl)
-
-    @property
-    def quiesced(self):
-        return pn_reactor_quiesced(self._impl)
-
-    def process(self):
-        result = pn_reactor_process(self._impl)
-        if self.errors:
-            for exc, value, tb in self.errors[:-1]:
-                traceback.print_exception(exc, value, tb)
-            exc, value, tb = self.errors[-1]
-            raise exc, value, tb
-        return result
-
-    def stop(self):
-        pn_reactor_stop(self._impl)
-
-    def schedule(self, delay, task):
-        impl = _chandler(task, self.on_error)
-        task = Task.wrap(pn_reactor_schedule(self._impl, secs2millis(delay), impl))
-        pn_decref(impl)
-        return task
-
-    def acceptor(self, host, port, handler=None):
-        impl = _chandler(handler, self.on_error)
-        aimpl = pn_reactor_acceptor(self._impl, unicode2utf8(host), str(port), impl)
-        pn_decref(impl)
-        if aimpl:
-            return Acceptor(aimpl)
-        else:
-            raise IOError("%s (%s:%s)" % (pn_error_text(pn_io_error(pn_reactor_io(self._impl))), host, port))
-
-    def connection(self, handler=None):
-        impl = _chandler(handler, self.on_error)
-        result = Connection.wrap(pn_reactor_connection(self._impl, impl))
-        pn_decref(impl)
-        return result
-
-    def selectable(self, handler=None):
-        impl = _chandler(handler, self.on_error)
-        result = Selectable.wrap(pn_reactor_selectable(self._impl))
-        if impl:
-            record = pn_selectable_attachments(result._impl)
-            pn_record_set_handler(record, impl)
-            pn_decref(impl)
-        return result
-
-    def update(self, sel):
-        pn_reactor_update(self._impl, sel._impl)
-
-    def push_event(self, obj, etype):
-        pn_collector_put(pn_reactor_collector(self._impl), PN_PYREF, pn_py2void(obj), etype.number)
-
-from proton import wrappers as _wrappers
-_wrappers["pn_reactor"] = lambda x: Reactor.wrap(pn_cast_pn_reactor(x))
-_wrappers["pn_task"] = lambda x: Task.wrap(pn_cast_pn_task(x))
-
-
-class EventInjector(object):
-    """
-    Can be added to an io loop to allow events to be triggered by an
-    external thread but handled on the event thread associated with
-    the loop.
-    """
-    def __init__(self):
-        self.queue = Queue.Queue()
-        self.pipe = os.pipe()
-        self._closed = False
-
-    def trigger(self, event):
-        self.queue.put(event)
-        os.write(self.pipe[1], "!")
-
-    def close(self):
-        self._closed = True
-        os.write(self.pipe[1], "!")
-
-    def fileno(self):
-        return self.pipe[0]
-
-    def on_selectable_init(self, event):
-        sel = event.context
-        sel.fileno(self.fileno())
-        sel.reading = True
-        event.reactor.update(sel)
-
-    def on_selectable_readable(self, event):
-        os.read(self.pipe[0], 512)
-        while not self.queue.empty():
-            requested = self.queue.get()
-            event.reactor.push_event(requested.context, requested.type)
-        if self._closed:
-            s = event.context
-            s.terminate()
-            event.reactor.update(s)
-
-
-class Names(object):
-    def __init__(self, base=10000):
-        self.names = []
-        self.base = base
-
-    def number(self, name):
-        if name not in self.names:
-            self.names.append(name)
-        return self.names.index(name) + self.base
-
-class ExtendedEventType(EventType):
-    USED = Names()
-    """
-    Event type identifier for events defined outside the proton-c
-    library
-    """
-    def __init__(self, name, number=None):
-        super(ExtendedEventType, self).__init__(number or ExtendedEventType.USED.number(name), "on_%s" % name)
-        self.name = name
-
-class ApplicationEvent(EventBase):
-    """
-    Application defined event, which can optionally be associated with
-    an engine object and or an arbitrary subject
-    """
-    def __init__(self, typename, connection=None, session=None, link=None, delivery=None, subject=None):
-        super(ApplicationEvent, self).__init__(PN_PYREF, self, ExtendedEventType(typename))
-        self.connection = connection
-        self.session = session
-        self.link = link
-        self.delivery = delivery
-        if self.delivery:
-            self.link = self.delivery.link
-        if self.link:
-            self.session = self.link.session
-        if self.session:
-            self.connection = self.session.connection
-        self.subject = subject
-
-    def __repr__(self):
-        objects = [self.connection, self.session, self.link, self.delivery, self.subject]
-        return "%s(%s)" % (typename, ", ".join([str(o) for o in objects if o is not None]))
-
-class StartEvent(ApplicationEvent):
-    def __init__(self, container):
-        super(StartEvent, self).__init__("start")
-        self.container = container
-
-
-class Transaction(object):
-    """
-    Class to track state of an AMQP 1.0 transaction.
-    """
-    def __init__(self, txn_ctrl, handler, settle_before_discharge=False):
-        self.txn_ctrl = txn_ctrl
-        self.handler = handler
-        self.id = None
-        self._declare = None
-        self._discharge = None
-        self.failed = False
-        self._pending = []
-        self.settle_before_discharge = settle_before_discharge
-        self.declare()
-
-    def commit(self):
-        self.discharge(False)
-
-    def abort(self):
-        self.discharge(True)
-
-    def declare(self):
-        self._declare = self._send_ctrl(symbol(u'amqp:declare:list'), [None])
-
-    def discharge(self, failed):
-        self.failed = failed
-        self._discharge = self._send_ctrl(symbol(u'amqp:discharge:list'), [self.id, failed])
-
-    def _send_ctrl(self, descriptor, value):
-        delivery = self.txn_ctrl.send(Message(body=Described(descriptor, value)))
-        delivery.transaction = self
-        return delivery
-
-    def send(self, sender, msg, tag=None):
-        dlv = sender.send(msg, tag=tag)
-        dlv.local.data = [self.id]
-        dlv.update(0x34)
-        return dlv
-
-    def accept(self, delivery):
-        self.update(delivery, PN_ACCEPTED)
-        if self.settle_before_discharge:
-            delivery.settle()
-        else:
-            self._pending.append(delivery)
-
-    def update(self, delivery, state=None):
-        if state:
-            delivery.local.data = [self.id, Described(ulong(state), [])]
-            delivery.update(0x34)
-
-    def _release_pending(self):
-        for d in self._pending:
-            d.update(Delivery.RELEASED)
-            d.settle()
-        self._clear_pending()
-
-    def _clear_pending(self):
-        self._pending = []
-
-    def handle_outcome(self, event):
-        if event.delivery == self._declare:
-            if event.delivery.remote.data:
-                self.id = event.delivery.remote.data[0]
-                self.handler.on_transaction_declared(event)
-            elif event.delivery.remote_state == Delivery.REJECTED:
-                self.handler.on_transaction_declare_failed(event)
-            else:
-                logging.warning("Unexpected outcome for declare: %s" % event.delivery.remote_state)
-                self.handler.on_transaction_declare_failed(event)
-        elif event.delivery == self._discharge:
-            if event.delivery.remote_state == Delivery.REJECTED:
-                if not self.failed:
-                    self.handler.on_transaction_commit_failed(event)
-                    self._release_pending() # make this optional?
-            else:
-                if self.failed:
-                    self.handler.on_transaction_aborted(event)
-                    self._release_pending()
-                else:
-                    self.handler.on_transaction_committed(event)
-            self._clear_pending()
-
-class LinkOption(object):
-    """
-    Abstract interface for link configuration options
-    """
-    def apply(self, link):
-        """
-        Subclasses will implement any configuration logic in this
-        method
-        """
-        pass
-    def test(self, link):
-        """
-        Subclasses can override this to selectively apply an option
-        e.g. based on some link criteria
-        """
-        return True
-
-class AtMostOnce(LinkOption):
-    def apply(self, link):
-        link.snd_settle_mode = Link.SND_SETTLED
-
-class AtLeastOnce(LinkOption):
-    def apply(self, link):
-        link.snd_settle_mode = Link.SND_UNSETTLED
-        link.rcv_settle_mode = Link.RCV_FIRST
-
-class SenderOption(LinkOption):
-    def apply(self, sender): pass
-    def test(self, link): return link.is_sender
-
-class ReceiverOption(LinkOption):
-    def apply(self, receiver): pass
-    def test(self, link): return link.is_receiver
-
-class DynamicNodeProperties(LinkOption):
-    def __init__(self, props={}):
-        self.properties = {}
-        for k in props:
-            if isinstance(k, symbol):
-                self.properties[k] = props[k]
-            else:
-                self.properties[symbol(k)] = props[k]
-
-    def apply(self, link):
-        if link.is_receiver:
-            link.source.properties.put_dict(self.properties)
-        else:
-            link.target.properties.put_dict(self.properties)
-
-class Filter(ReceiverOption):
-    def __init__(self, filter_set={}):
-        self.filter_set = filter_set
-
-    def apply(self, receiver):
-        receiver.source.filter.put_dict(self.filter_set)
-
-class Selector(Filter):
-    """
-    Configures a link with a message selector filter
-    """
-    def __init__(self, value, name='selector'):
-        super(Selector, self).__init__({symbol(name): Described(symbol('apache.org:selector-filter:string'), value)})
-
-def _apply_link_options(options, link):
-    if options:
-        if isinstance(options, list):
-            for o in options:
-                if o.test(link): o.apply(link)
-        else:
-            if options.test(link): options.apply(link)
-
-def _create_session(connection, handler=None):
-    session = connection.session()
-    session.open()
-    return session
-
-
-def _get_attr(target, name):
-    if hasattr(target, name):
-        return getattr(target, name)
-    else:
-        return None
-
-class SessionPerConnection(object):
-    def __init__(self):
-        self._default_session = None
-
-    def session(self, connection):
-        if not self._default_session:
-            self._default_session = _create_session(connection)
-            self._default_session.context = self
-        return self._default_session
-
-    def on_session_remote_close(self, event):
-        event.connection.close()
-        self._default_session = None
-
-class GlobalOverrides(object):
-    """
-    Internal handler that triggers the necessary socket connect for an
-    opened connection.
-    """
-    def __init__(self, base):
-        self.base = base
-
-    def on_unhandled(self, name, event):
-        if not self._override(event):
-            event.dispatch(self.base)
-
-    def _override(self, event):
-        conn = event.connection
-        return conn and hasattr(conn, '_overrides') and event.dispatch(conn._overrides)
-
-class Connector(Handler):
-    """
-    Internal handler that triggers the necessary socket connect for an
-    opened connection.
-    """
-    def __init__(self, connection):
-        self.connection = connection
-        self.address = None
-        self.heartbeat = None
-        self.reconnect = None
-        self.ssl_domain = None
-
-    def _connect(self, connection):
-        url = self.address.next()
-        # IoHandler uses the hostname to determine where to try to connect to
-        connection.hostname = "%s:%i" % (url.host, url.port)
-        logging.info("connecting to %s..." % connection.hostname)
-
-        transport = Transport()
-        transport.bind(connection)
-        if self.heartbeat:
-            transport.idle_timeout = self.heartbeat
-        if url.scheme == 'amqps' and self.ssl_domain:
-            self.ssl = SSL(transport, self.ssl_domain)
-            self.ssl.peer_hostname = url.host
-        if url.username:
-            sasl = transport.sasl()
-            if url.username == 'anonymous':
-                sasl.mechanisms('ANONYMOUS')
-            else:
-                sasl.plain(url.username, url.password)
-
-    def on_connection_local_open(self, event):
-        self._connect(event.connection)
-
-    def on_connection_remote_open(self, event):
-        logging.info("connected to %s" % event.connection.hostname)
-        if self.reconnect:
-            self.reconnect.reset()
-            self.transport = None
-
-    def on_transport_tail_closed(self, event):
-        self.on_transport_closed(event)
-
-    def on_transport_closed(self, event):
-        if self.connection and self.connection.state & Endpoint.LOCAL_ACTIVE:
-            if self.reconnect:
-                event.transport.unbind()
-                delay = self.reconnect.next()
-                if delay == 0:
-                    logging.info("Disconnected, reconnecting...")
-                    self._connect(self.connection)
-                else:
-                    logging.info("Disconnected will try to reconnect after %s seconds" % delay)
-                    event.reactor.schedule(delay, self)
-            else:
-                logging.info("Disconnected")
-                self.connection = None
-
-    def on_timer_task(self, event):
-        self._connect(self.connection)
-
-    def on_connection_remote_close(self, event):
-        self.connection = None
-
-class Backoff(object):
-    """
-    A reconnect strategy involving an increasing delay between
-    retries, up to a maximum or 10 seconds.
-    """
-    def __init__(self):
-        self.delay = 0
-
-    def reset(self):
-        self.delay = 0
-
-    def next(self):
-        current = self.delay
-        if current == 0:
-            self.delay = 0.1
-        else:
-            self.delay = min(10, 2*current)
-        return current
-
-class Urls(object):
-    def __init__(self, values):
-        self.values = [Url(v) for v in values]
-        self.i = iter(self.values)
-
-    def __iter__(self):
-        return self
-
-    def next(self):
-        try:
-            return self.i.next()
-        except StopIteration:
-            self.i = iter(self.values)
-            return self.i.next()
-
-class SSLConfig(object):
-    def __init__(self):
-        self.client = SSLDomain(SSLDomain.MODE_CLIENT)
-        self.server = SSLDomain(SSLDomain.MODE_SERVER)
-
-    def set_credentials(self, cert_file, key_file, password):
-        self.client.set_credentials(cert_file, key_file, password)
-        self.server.set_credentials(cert_file, key_file, password)
-
-    def set_trusted_ca_db(self, certificate_db):
-        self.client.set_trusted_ca_db(certificate_db)
-        self.server.set_trusted_ca_db(certificate_db)
-
-
-class Container(Reactor):
-    def __init__(self, *handlers, **kwargs):
-        super(Container, self).__init__(*handlers, **kwargs)
-        if "impl" not in kwargs:
-            self.ssl = SSLConfig()
-            self.global_handler = GlobalOverrides(kwargs.get('global_handler', self.global_handler))
-            self.trigger = None
-            self.container_id = str(generate_uuid())
-            Wrapper.__setattr__(self, 'subclass', self.__class__)
-
-    def connect(self, url=None, urls=None, address=None, handler=None, reconnect=None, heartbeat=None, ssl_domain=None):
-        conn = self.connection(handler)
-        conn.container = self.container_id or str(generate_uuid())
-
-        connector = Connector(conn)
-        conn._overrides = connector
-        if url: connector.address = Urls([url])
-        elif urls: connector.address = Urls(urls)
-        elif address: connector.address = address
-        else: raise ValueError("One of url, urls or address required")
-        if heartbeat:
-            connector.heartbeat = heartbeat
-        if reconnect:
-            connector.reconnect = reconnect
-        elif reconnect is None:
-            connector.reconnect = Backoff()
-        connector.ssl_domain = ssl_domain or self.ssl.client
-        conn._session_policy = SessionPerConnection() #todo: make configurable
-        conn.open()
-        return conn
-
-    def _get_id(self, container, remote, local):
-        if local and remote: "%s-%s-%s" % (container, remote, local)
-        elif local: return "%s-%s" % (container, local)
-        elif remote: return "%s-%s" % (container, remote)
-        else: return "%s-%s" % (container, str(generate_uuid()))
-
-    def _get_session(self, context):
-        if isinstance(context, Url):
-            return self._get_session(self.connect(url=context))
-        elif isinstance(context, Session):
-            return context
-        elif isinstance(context, Connection):
-            if hasattr(context, '_session_policy'):
-                return context._session_policy.session(context)
-            else:
-                return _create_session(context)
-        else:
-            return context.session()
-
-    def create_sender(self, context, target=None, source=None, name=None, handler=None, tags=None, options=None):
-        if isinstance(context, basestring):
-            context = Url(context)
-        if isinstance(context, Url) and not target:
-            target = context.path
-        session = self._get_session(context)
-        snd = session.sender(name or self._get_id(session.connection.container, target, source))
-        if source:
-            snd.source.address = source
-        if target:
-            snd.target.address = target
-        if handler:
-            snd.handler = handler
-        if tags:
-            snd.tag_generator = tags
-        _apply_link_options(options, snd)
-        snd.open()
-        return snd
-
-    def create_receiver(self, context, source=None, target=None, name=None, dynamic=False, handler=None, options=None):
-        if isinstance(context, basestring):
-            context = Url(context)
-        if isinstance(context, Url) and not source:
-            source = context.path
-        session = self._get_session(context)
-        rcv = session.receiver(name or self._get_id(session.connection.container, source, target))
-        if source:
-            rcv.source.address = source
-        if dynamic:
-            rcv.source.dynamic = True
-        if target:
-            rcv.target.address = target
-        if handler:
-            rcv.handler = handler
-        _apply_link_options(options, rcv)
-        rcv.open()
-        return rcv
-
-    def declare_transaction(self, context, handler=None, settle_before_discharge=False):
-        if not _get_attr(context, '_txn_ctrl'):
-            class InternalTransactionHandler(OutgoingMessageHandler):
-                def __init__(self):
-                    super(InternalTransactionHandler, self).__init__(auto_settle=True)
-
-                def on_settled(self, event):
-                    if hasattr(event.delivery, "transaction"):
-                        event.transaction = event.delivery.transaction
-                        event.delivery.transaction.handle_outcome(event)
-            context._txn_ctrl = self.create_sender(context, None, name='txn-ctrl', handler=InternalTransactionHandler())
-            context._txn_ctrl.target.type = Terminus.COORDINATOR
-            context._txn_ctrl.target.capabilities.put_object(symbol(u'amqp:local-transactions'))
-        return Transaction(context._txn_ctrl, handler, settle_before_discharge)
-
-    def listen(self, url, ssl_domain=None):
-        url = Url(url)
-        ssl_config = ssl_domain
-        if not ssl_config and url.scheme == 'amqps':
-            ssl_config = self.ssl_domain
-        return self.acceptor(url.host, url.port)
-
-    def get_event_trigger(self):
-        if not self.trigger or self.trigger.closed():
-            self.trigger = EventInjector()
-            self.selectable(self.trigger)
-        return self.trigger
-
-    def do_work(self, timeout=None):
-        if timeout:
-            self.timeout = timeout
-        return self.process()

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/proton-c/bindings/python/proton/utils.py
----------------------------------------------------------------------
diff --git a/proton-c/bindings/python/proton/utils.py b/proton-c/bindings/python/proton/utils.py
index 924f3d9..c64bc88 100644
--- a/proton-c/bindings/python/proton/utils.py
+++ b/proton-c/bindings/python/proton/utils.py
@@ -19,7 +19,7 @@
 import collections, Queue, socket, time, threading
 from proton import ConnectionException, Delivery, Endpoint, Handler, LinkException, Message
 from proton import ProtonException, Timeout, Url
-from proton.reactors import Container
+from proton.reactor import Container
 from proton.handlers import MessagingHandler, IncomingMessageHandler
 
 def utf8(s):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/tests/python/proton_tests/common.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/common.py b/tests/python/proton_tests/common.py
index 4303572..42cf7b1 100644
--- a/tests/python/proton_tests/common.py
+++ b/tests/python/proton_tests/common.py
@@ -24,7 +24,7 @@ from socket import socket, AF_INET, SOCK_STREAM
 from subprocess import Popen,PIPE,STDOUT
 import sys, os, string
 from proton import Connection, Transport, SASL, Endpoint, Delivery, SSL
-from proton.reactors import Container
+from proton.reactor import Container
 from proton.handlers import CHandshaker, CFlowController
 
 

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/tests/python/proton_tests/engine.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/engine.py b/tests/python/proton_tests/engine.py
index 55c22f9..82869db 100644
--- a/tests/python/proton_tests/engine.py
+++ b/tests/python/proton_tests/engine.py
@@ -21,7 +21,7 @@ import os, common, gc
 from time import time, sleep
 from proton import *
 from common import pump
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 # older versions of gc do not provide the garbage list
 if not hasattr(gc, "garbage"):

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/tests/python/proton_tests/reactor.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/reactor.py b/tests/python/proton_tests/reactor.py
index 8a1d893..4bf3cdf 100644
--- a/tests/python/proton_tests/reactor.py
+++ b/tests/python/proton_tests/reactor.py
@@ -18,7 +18,7 @@
 #
 
 from common import Test
-from proton.reactors import Reactor
+from proton.reactor import Reactor
 
 class Barf(Exception):
     pass

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/566baf1e/tests/python/proton_tests/utils.py
----------------------------------------------------------------------
diff --git a/tests/python/proton_tests/utils.py b/tests/python/proton_tests/utils.py
index 68ec007..727b586 100644
--- a/tests/python/proton_tests/utils.py
+++ b/tests/python/proton_tests/utils.py
@@ -24,7 +24,7 @@ from proton_tests.common import Test, free_tcp_port
 from copy import copy
 from proton import Message, Url, generate_uuid
 from proton.handlers import MessagingHandler
-from proton.reactors import Container
+from proton.reactor import Container
 from proton.utils import SyncRequestResponse, BlockingConnection
 
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org