upstream importupstream/14.3.1

4 files changed, 14 insertions, 49 deletions

diff --git a/zmq/backend/cffi/__init__.py b/zmq/backend/cffi/__init__.py
index da98024..ca3164d 100644
--- a/zmq/backend/cffi/__init__.py
+++ b/zmq/backend/cffi/__init__.py
@@ -3,40 +3,6 @@
 # Copyright (C) PyZMQ Developers
 # Distributed under the terms of the Modified BSD License.
 
-import imp
-import os.path
-import sys
-
-import cffi.vengine_cpy
-import cffi.vengine_gen
-_ma_triplet = None
-
-def vengine_gen_find_module(self, module_name, path, so_suffixes):
-    global _ma_triplet
-    if _ma_triplet is None:
-        try:
-            import subprocess as sp
-            p = sp.Popen(["gcc", "-print-multiarch"], stdout=sp.PIPE)
-            _ma_triplet = str(p.communicate()[0].decode().strip())
-        except:
-            import warnings
-            warnings.warn('failed to detect multiarch paths, please install gcc')
-
-    for so_suffix in so_suffixes + ['.%s-%s.so' % (imp.get_tag(), _ma_triplet)]:
-        basename = module_name + so_suffix
-        if path is None:
-            path = sys.path
-            # import from non root package would try __pycache__ which is
-            # cleaned by pypy installation
-            path.insert(0, "/usr/lib/pypy/dist-packages/zmq/backend/cffi")
-        for dirname in path:
-            filename = os.path.join(dirname, basename)
-            if os.path.isfile(filename):
-                return filename
-
-
-cffi.vengine_gen.VGenericEngine.find_module = vengine_gen_find_module
-
 from zmq.backend.cffi import (constants, error, message, context, socket,
                            _poll, devices, utils)
 
diff --git a/zmq/backend/cffi/_cffi.py b/zmq/backend/cffi/_cffi.py
index 97b947f..67f4b6b 100644
--- a/zmq/backend/cffi/_cffi.py
+++ b/zmq/backend/cffi/_cffi.py
@@ -106,10 +106,10 @@ int get_ipc_path_max_len(void);
 
 def load_compiler_config():
     import zmq
-    zmq_dir = "zmq"
+    zmq_dir = dirname(zmq.__file__)
     zmq_parent = dirname(zmq_dir)
     
-    fname = join(dirname(zmq.__file__), 'utils', 'compiler.json')
+    fname = join(zmq_dir, 'utils', 'compiler.json')
     if os.path.exists(fname):
         with open(fname) as f:
             cfg = json.load(f)
diff --git a/zmq/tests/test_message.py b/zmq/tests/test_message.py
index 5e9b58c..d8770bd 100644
--- a/zmq/tests/test_message.py
+++ b/zmq/tests/test_message.py
@@ -324,8 +324,10 @@ class TestFrame(BaseZMQTestCase):
         for i in range(1,len(shapes)+1):
             shape = shapes[:i]
             for dt in dtypes:
-                A = numpy.random.uniform(-10000000,
-                                         1000000, size=shape).astype(dt)
+                A = numpy.empty(shape, dtype=dt)
+                while numpy.isnan(A).any():
+                    # don't let nan sneak in
+                    A = numpy.ndarray(shape, dtype=dt)
                 a.send(A, copy=False)
                 msg = b.recv(copy=False)
                 
diff --git a/zmq/tests/test_monitor.py b/zmq/tests/test_monitor.py
index ab02b68..d47e23f 100644
--- a/zmq/tests/test_monitor.py
+++ b/zmq/tests/test_monitor.py
@@ -35,13 +35,11 @@ class TestSocketMonitor(BaseZMQTestCase):
         # test receive event for connect event
         s_rep.connect("tcp://127.0.0.1:6666")
         m = recv_monitor_message(s_event)
-        if m['event'] == zmq.EVENT_CONNECT_DELAYED:
-            self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6666")
-            # test receive event for connected event
-            m = recv_monitor_message(s_event)
-        self.assertEqual(m['event'], zmq.EVENT_CONNECTED)
+        self.assertEqual(m['event'], zmq.EVENT_CONNECT_DELAYED)
         self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6666")
-
+        # test receive event for connected event
+        m = recv_monitor_message(s_event)
+        self.assertEqual(m['event'], zmq.EVENT_CONNECTED)
 
     @skip_lt_4
     def test_monitor_connected(self):
@@ -58,9 +56,8 @@ class TestSocketMonitor(BaseZMQTestCase):
         # test receive event for connect event
         s_rep.connect("tcp://127.0.0.1:6667")
         m = recv_monitor_message(s_event)
-        if m['event'] == zmq.EVENT_CONNECT_DELAYED:
-            self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6667")
-            # test receive event for connected event
-            m = recv_monitor_message(s_event)
-        self.assertEqual(m['event'], zmq.EVENT_CONNECTED)
+        self.assertEqual(m['event'], zmq.EVENT_CONNECT_DELAYED)
         self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6667")
+        # test receive event for connected event
+        m = recv_monitor_message(s_event)
+        self.assertEqual(m['event'], zmq.EVENT_CONNECTED)