GH-109: fix unusable subscriber.poll() method in Python bindings

(cherry picked from commit 182d6d1)

CHANGES

@@ -1,4 +1,10 @@
 
+1.3.3 | 2020-04-30 09:50:24 -0700
+
+  * Release 1.3.3.
+
+  * GH-109: fix unusable subscriber.poll() method in Python bindings (Jon Siwek, Corelight)
+
 1.3.2 | 2020-04-10 16:22:15 -0700
 
   * Release 1.3.2.

NEWS

@@ -1,3 +1,8 @@
+Broker 1.3.3
+============
+
+- Fix unusable subscriber.poll() method in Python bindings.
+
 Broker 1.3.2
 ============
 

VERSION

@@ -1 +1 @@
-1.3.2
+1.3.3

bindings/python/_broker.cpp

@@ -177,7 +177,15 @@ PYBIND11_MODULE(_broker, m) {
        return rval;
 	  })
 
-    .def("poll", &subscriber_base::poll)
+    .def("poll",
+         [](subscriber_base& ep) -> std::vector<topic_data_pair> {
+       auto res = ep.poll();
+       std::vector<topic_data_pair> rval;
+       rval.reserve(res.size());
+       for ( auto& e : res )
+         rval.emplace_back(std::make_pair(broker::get_topic(e), broker::get_data(e)));
+       return rval;
+      })
     .def("available", &subscriber_base::available)
     .def("fd", &subscriber_base::fd);
 

include/broker/version.hh

@@ -10,7 +10,7 @@ using type = unsigned;
 
 constexpr type major = 1;
 constexpr type minor = 3;
-constexpr type patch = 2;
+constexpr type patch = 3;
 constexpr auto suffix = "";
 
 constexpr type protocol = 2;

tests/python/communication.py

@@ -33,7 +33,18 @@ def test_ping(self):
         self.assertEqual(d[0], "ping")
 
         ep1.publish(t, ["pong"])
-        (t, d) = s2.get()
+
+        while True:
+            # This loop exists just for sake of test coverage for "poll()"
+            msgs = s2.poll()
+
+            if msgs:
+                self.assertEqual(len(msgs), 1)
+                (t, d) = msgs[0]
+                break;
+
+            time.sleep(0.1)
+
         self.assertEqual(t, "/test")
         self.assertEqual(d[0], "pong")