From c29b019291b27c765e86dfef496005ba8cf2e7ae Mon Sep 17 00:00:00 2001
From: Arvid Norberg <arvid@libtorrent.org>
Date: Fri, 4 Jan 2013 17:52:35 +0000
Subject: [PATCH] merged python binding fix from RC_0_16

---
 ChangeLog                       |  1 +
 bindings/python/src/session.cpp | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index cc880ed7c..875a41402 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -8,6 +8,7 @@
 	* fix uTP edge case where udp socket buffer fills up
 	* fix nagle implementation in uTP
 
+	* added missing pop_alerts() to python bindings
 	* fixed typos in configure script, inversing some feature-enable/disable flags
 	* added missing flag_update_subscribe to python bindings
 	* active_dht_limit, active_tracker_limit and active_lsd_limit now interpret -1 as infinite
diff --git a/bindings/python/src/session.cpp b/bindings/python/src/session.cpp
index c81d0d320..ed8fe81fc 100644
--- a/bindings/python/src/session.cpp
+++ b/bindings/python/src/session.cpp
@@ -418,6 +418,24 @@ namespace
         return e;
     }
 
+    list pop_alerts(session& ses)
+    {
+        std::deque<alert*> alerts;
+        {
+            allow_threading_guard guard;
+            ses.pop_alerts(&alerts);
+        }
+
+        list ret;
+        for (std::deque<alert*>::iterator i = alerts.begin()
+            , end(alerts.end()); i != end; ++i)
+        {
+				std::auto_ptr<alert> ptr(*i);
+            ret.append(ptr);
+        }
+        return ret;
+    }
+
 } // namespace unnamed
 
 
@@ -628,6 +646,7 @@ void bind_session()
 #endif
         .def("set_alert_mask", allow_threads(&session::set_alert_mask))
         .def("pop_alert", allow_threads(&session::pop_alert))
+        .def("pop_alerts", &pop_alerts)
         .def("wait_for_alert", &wait_for_alert, return_internal_reference<>())
         .def("add_extension", &add_extension)
 #ifndef TORRENT_NO_DEPRECATE