move zmq.device out of backends

it's a deprecated wrapper for zmq.proxy, no need to have two implementations

Author: minrk

zmq/__init__.pyi

@@ -14,7 +14,6 @@ __version__: str
 from .backend import IPC_PATH_MAX_LEN as IPC_PATH_MAX_LEN
 from .backend import curve_keypair as curve_keypair
 from .backend import curve_public as curve_public
-from .backend import device as device
 from .backend import has as has
 from .backend import proxy as proxy
 from .backend import proxy_steerable as proxy_steerable

zmq/backend/__init__.pyi

@@ -111,7 +111,6 @@ def zmq_version_info() -> tuple[int, int, int]: ...
 def zmq_poll(
     sockets: list[Any], timeout: int | None = ...
 ) -> list[tuple[Socket, int]]: ...
-def device(device_type: int, frontend: Socket, backend: Socket | None = ...) -> int: ...
 def proxy(frontend: Socket, backend: Socket, capture: Socket | None = None) -> int: ...
 def proxy_steerable(
     frontend: Socket,

zmq/backend/cffi/_cdefs.h

@@ -9,8 +9,6 @@ int zmq_connect(void *socket, const char *endpoint);
 int zmq_errno(void);
 const char * zmq_strerror(int errnum);
 
-int zmq_device(int device, void *frontend, void *backend);
-
 int zmq_unbind(void *socket, const char *endpoint);
 int zmq_disconnect(void *socket, const char *endpoint);
 void* zmq_ctx_new();

zmq/backend/cffi/devices.py

@@ -9,10 +9,6 @@
 from .utils import _retry_sys_call
 
 
-def device(device_type, frontend, backend):
-    return proxy(frontend, backend)
-
-
 def proxy(frontend, backend, capture=None):
     if isinstance(capture, Socket):
         capture = capture._zmq_socket
@@ -60,4 +56,4 @@ def proxy_steerable(frontend, backend, capture=None, control=None):
     )
 
 
-__all__ = ['device', 'proxy', 'proxy_steerable']
+__all__ = ['proxy', 'proxy_steerable']

zmq/backend/cython/_zmq.py

@@ -105,7 +105,6 @@
     zmq_ctx_set,
     zmq_curve_keypair,
     zmq_curve_public,
-    zmq_device,
     zmq_disconnect,
     zmq_free_fn,
     zmq_getsockopt,
@@ -1678,42 +1677,6 @@ def zmq_poll(sockets, timeout: C.int = -1):
     return results
 
 
-# device functions
-
-
-def device(device_type: C.int, frontend: Socket, backend: Socket = None):
-    """
-    Start a zeromq device.
-
-    .. deprecated:: libzmq-3.2
-        Use zmq.proxy
-
-    Parameters
-    ----------
-    device_type : int
-        one of: QUEUE, FORWARDER, STREAMER
-        The type of device to start.
-    frontend : Socket
-        The Socket instance for the incoming traffic.
-    backend : Socket
-        The Socket instance for the outbound traffic.
-    """
-    if ZMQ_VERSION_MAJOR >= 3:
-        return proxy(frontend, backend)
-
-    rc: C.int = 0
-    while True:
-        with nogil:
-            rc = zmq_device(device_type, frontend.handle, backend.handle)
-        try:
-            _check_rc(rc)
-        except InterruptedSystemCall:
-            continue
-        else:
-            break
-    return rc
-
-
 def proxy(frontend: Socket, backend: Socket, capture: Socket = None):
     """
     Start a zeromq proxy (replacement for device).
@@ -2038,7 +2001,6 @@ def monitored_queue(
     'zmq_errno',
     'zmq_poll',
     'strerror',
-    'device',
     'proxy',
     'proxy_steerable',
 ]

zmq/backend/cython/libzmq.pxd

@@ -102,7 +102,6 @@ cdef extern from "zmq.h" nogil:
 
     int zmq_poll (zmq_pollitem_t *items, int nitems, long timeout)
 
-    int zmq_device (int device_, void *insocket_, void *outsocket_)
     int zmq_proxy (void *frontend, void *backend, void *capture)
     int zmq_proxy_steerable (void *frontend,
                              void *backend,

zmq/backend/select.py

@@ -11,7 +11,6 @@
     'Socket',
     'Frame',
     'Message',
-    'device',
     'proxy',
     'proxy_steerable',
     'zmq_poll',

zmq/devices/__init__.py

@@ -3,7 +3,9 @@
 # Copyright (C) PyZMQ Developers
 # Distributed under the terms of the Modified BSD License.
 
-from zmq import device
+from __future__ import annotations
+
+from zmq import DeviceType, proxy
 from zmq.devices import (
     basedevice,
     monitoredqueue,
@@ -17,7 +19,7 @@
 from zmq.devices.proxydevice import *
 from zmq.devices.proxysteerabledevice import *
 
-__all__ = ['device']
+__all__ = []
 for submod in (
     basedevice,
     proxydevice,

zmq/devices/basedevice.py

@@ -9,7 +9,7 @@
 from typing import Any, Callable, List, Optional, Tuple
 
 import zmq
-from zmq import ENOTSOCK, ETERM, PUSH, QUEUE, Context, ZMQBindError, ZMQError, device
+from zmq import ENOTSOCK, ETERM, PUSH, QUEUE, Context, ZMQBindError, ZMQError, proxy
 
 
 class Device:
@@ -233,7 +233,7 @@ def run_device(self) -> None:
         Do not call me directly, instead call ``self.start()``, just like a Thread.
         """
         ins, outs = self._setup_sockets()
-        device(self.device_type, ins, outs)
+        proxy(ins, outs)
 
     def _close_sockets(self):
         """Cleanup sockets we created"""

zmq/sugar/__init__.py

@@ -3,10 +3,25 @@
 # Copyright (C) PyZMQ Developers
 # Distributed under the terms of the Modified BSD License.
 
+from __future__ import annotations
+
 from zmq import error
+from zmq.backend import proxy
+from zmq.constants import DeviceType
 from zmq.sugar import context, frame, poll, socket, tracker, version
 
-__all__ = []
+
+def device(device_type: DeviceType, frontend: socket.Socket, backend: socket.Socket):
+    """Deprecated alias for zmq.proxy
+
+    .. versiondeprecated:: libzmq-3.2
+    .. versiondeprecated:: 13.0
+    """
+
+    return proxy(frontend, backend)
+
+
+__all__ = ["device"]
 for submod in (context, error, frame, poll, socket, tracker, version):
     __all__.extend(submod.__all__)