Merge branch 'master' into rpc

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

1 files changed, 0 insertions, 24 deletions

diff --git a/src/console/zmq/backend/cffi/devices.py b/src/console/zmq/backend/cffi/devices.py
deleted file mode 100755
index c7a514a8..00000000
--- a/src/console/zmq/backend/cffi/devices.py
+++ /dev/null
@@ -1,24 +0,0 @@
-# coding: utf-8
-"""zmq device functions"""
-
-# Copyright (C) PyZMQ Developers
-# Distributed under the terms of the Modified BSD License.
-
-from ._cffi import C, ffi, zmq_version_info
-from .socket import Socket
-from zmq.error import ZMQError, _check_rc
-
-def device(device_type, frontend, backend):
-    rc = C.zmq_proxy(frontend._zmq_socket, backend._zmq_socket, ffi.NULL)
-    _check_rc(rc)
-
-def proxy(frontend, backend, capture=None):
-    if isinstance(capture, Socket):
-        capture = capture._zmq_socket
-    else:
-        capture = ffi.NULL
-
-    rc = C.zmq_proxy(frontend._zmq_socket, backend._zmq_socket, capture)
-    _check_rc(rc)
-
-__all__ = ['device', 'proxy']