[Python-modules-commits] r29369 - in packages/pyzmq/trunk/debian/patches (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Tuesday, June 17, 2014 @ 21:35:23
  Author: jtaylor-guest
Revision: 29369

refresh patches

Modified:
  packages/pyzmq/trunk/debian/patches/cffi-fix.patch
  packages/pyzmq/trunk/debian/patches/monitor-test.patch
  packages/pyzmq/trunk/debian/patches/noncopysend-test.patch

Modified: packages/pyzmq/trunk/debian/patches/cffi-fix.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/cffi-fix.patch	2014-06-17 21:35:19 UTC (rev 29368)
+++ packages/pyzmq/trunk/debian/patches/cffi-fix.patch	2014-06-17 21:35:23 UTC (rev 29369)
@@ -11,9 +11,9 @@
 
 --- a/zmq/backend/cffi/__init__.py
 +++ b/zmq/backend/cffi/__init__.py
-@@ -9,6 +9,40 @@
- #  the file COPYING.BSD, distributed as part of this software.
- #-----------------------------------------------------------------------------
+@@ -3,6 +3,40 @@
+ # Copyright (C) PyZMQ Developers
+ # Distributed under the terms of the Modified BSD License.
  
 +import imp
 +import os.path
@@ -54,7 +54,7 @@
  
 --- a/zmq/backend/cffi/_cffi.py
 +++ b/zmq/backend/cffi/_cffi.py
-@@ -119,10 +119,10 @@ int get_ipc_path_max_len(void);
+@@ -106,10 +106,10 @@ int get_ipc_path_max_len(void);
  
  def load_compiler_config():
      import zmq

Modified: packages/pyzmq/trunk/debian/patches/monitor-test.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/monitor-test.patch	2014-06-17 21:35:19 UTC (rev 29368)
+++ packages/pyzmq/trunk/debian/patches/monitor-test.patch	2014-06-17 21:35:23 UTC (rev 29369)
@@ -2,7 +2,7 @@
 Bug: https://github.com/zeromq/pyzmq/pull/558
 --- a/zmq/tests/test_monitor.py
 +++ b/zmq/tests/test_monitor.py
-@@ -35,11 +35,13 @@ class TestSocketMonitor(BaseZMQTestCase):
+@@ -35,11 +35,13 @@ class TestSocketMonitor(BaseZMQTestCase)
          # test receive event for connect event
          s_rep.connect("tcp://127.0.0.1:6666")
          m = recv_monitor_message(s_event)
@@ -20,7 +20,7 @@
  
      @skip_lt_4
      def test_monitor_connected(self):
-@@ -56,8 +58,9 @@ class TestSocketMonitor(BaseZMQTestCase):
+@@ -56,8 +58,9 @@ class TestSocketMonitor(BaseZMQTestCase)
          # test receive event for connect event
          s_rep.connect("tcp://127.0.0.1:6667")
          m = recv_monitor_message(s_event)
@@ -34,5 +34,3 @@
 +            m = recv_monitor_message(s_event)
          self.assertEqual(m['event'], zmq.EVENT_CONNECTED)
 +        self.assertEqual(m['endpoint'], b"tcp://127.0.0.1:6667")
-
-

Modified: packages/pyzmq/trunk/debian/patches/noncopysend-test.patch
===================================================================
--- packages/pyzmq/trunk/debian/patches/noncopysend-test.patch	2014-06-17 21:35:19 UTC (rev 29368)
+++ packages/pyzmq/trunk/debian/patches/noncopysend-test.patch	2014-06-17 21:35:23 UTC (rev 29369)
@@ -5,7 +5,7 @@
 
 --- a/zmq/tests/test_message.py
 +++ b/zmq/tests/test_message.py
-@@ -336,10 +336,8 @@ class TestFrame(BaseZMQTestCase):
+@@ -324,10 +324,8 @@ class TestFrame(BaseZMQTestCase):
          for i in range(1,len(shapes)+1):
              shape = shapes[:i]
              for dt in dtypes: