Merge branch 'master' into rpc

Conflicts:
	linux/ws_main.py
	linux_dpdk/ws_main.py

1 files changed, 0 insertions, 39 deletions

diff --git a/src/console/zmq/backend/select.py b/src/console/zmq/backend/select.py
deleted file mode 100755
index 0a2e09a2..00000000
--- a/src/console/zmq/backend/select.py
+++ /dev/null
@@ -1,39 +0,0 @@
-"""Import basic exposure of libzmq C API as a backend"""
-
-# Copyright (C) PyZMQ Developers
-# Distributed under the terms of the Modified BSD License.
-
-public_api = [
-    'Context',
-    'Socket',
-    'Frame',
-    'Message',
-    'Stopwatch',
-    'device',
-    'proxy',
-    'zmq_poll',
-    'strerror',
-    'zmq_errno',
-    'has',
-    'curve_keypair',
-    'constants',
-    'zmq_version_info',
-    'IPC_PATH_MAX_LEN',
-]
-
-def select_backend(name):
-    """Select the pyzmq backend"""
-    try:
-        mod = __import__(name, fromlist=public_api)
-    except ImportError:
-        raise
-    except Exception as e:
-        import sys
-        from zmq.utils.sixcerpt import reraise
-        exc_info = sys.exc_info()
-        reraise(ImportError, ImportError("Importing %s failed with %s" % (name, e)), exc_info[2])
-    
-    ns = {}
-    for key in public_api:
-        ns[key] = getattr(mod, key)
-    return ns