Merge branch 'master' into dan_latest

1 files changed, 16 insertions, 0 deletions

diff --git a/src/console/zmq/devices/__init__.py b/src/console/zmq/devices/__init__.py
new file mode 100755
index 00000000..23715963
--- /dev/null
+++ b/src/console/zmq/devices/__init__.py
@@ -0,0 +1,16 @@
+"""0MQ Device classes for running in background threads or processes."""
+
+# Copyright (C) PyZMQ Developers
+# Distributed under the terms of the Modified BSD License.
+
+from zmq import device
+from zmq.devices import basedevice, proxydevice, monitoredqueue, monitoredqueuedevice
+
+from zmq.devices.basedevice import *
+from zmq.devices.proxydevice import *
+from zmq.devices.monitoredqueue import *
+from zmq.devices.monitoredqueuedevice import *
+
+__all__ = ['device']
+for submod in (basedevice, proxydevice, monitoredqueue, monitoredqueuedevice):
+    __all__.extend(submod.__all__)