From a0770a087af4ef22885423fda04bd12ddc66314f Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Sun, 10 Jan 2016 19:53:54 -0800
Subject: [PATCH 1/2] Fix python 3 compatibility

---
 bindings/python/src/session.cpp | 2 +-
 bindings/python/test.py         | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/bindings/python/src/session.cpp b/bindings/python/src/session.cpp
index cb24ca975..2bf60b49a 100644
--- a/bindings/python/src/session.cpp
+++ b/bindings/python/src/session.cpp
@@ -100,7 +100,7 @@ namespace
 
 	void make_settings_pack(lt::settings_pack& p, dict const& sett_dict)
 	{
-		list iterkeys = (list)sett_dict.iterkeys();
+		list iterkeys = (list)sett_dict.keys();
 		for (int i = 0; i < boost::python::len(iterkeys); i++)
 		{
 			std::string key = extract<std::string>(iterkeys[i]);
diff --git a/bindings/python/test.py b/bindings/python/test.py
index 3d039717e..090a561bf 100644
--- a/bindings/python/test.py
+++ b/bindings/python/test.py
@@ -57,13 +57,13 @@ class test_bencoder(unittest.TestCase):
 	def test_bencode(self):
 
 		encoded = lt.bencode({'a': 1, 'b': [1,2,3], 'c': 'foo'})
-		self.assertEqual(encoded, 'd1:ai1e1:bli1ei2ei3ee1:c3:fooe')
+		self.assertEqual(encoded, b'd1:ai1e1:bli1ei2ei3ee1:c3:fooe')
 
 	def test_bdecode(self):
 
-		encoded = 'd1:ai1e1:bli1ei2ei3ee1:c3:fooe'
+		encoded = b'd1:ai1e1:bli1ei2ei3ee1:c3:fooe'
 		decoded = lt.bdecode(encoded)
-		self.assertEqual(decoded, {'a': 1, 'b': [1,2,3], 'c': 'foo'})
+		self.assertEqual(decoded, {b'a': 1, b'b': [1,2,3], b'c': b'foo'})
 
 class test_sha1hash(unittest.TestCase):
 
@@ -74,6 +74,6 @@ class test_sha1hash(unittest.TestCase):
 
 
 if __name__ == '__main__':
-	print lt.__version__
+	print(lt.__version__)
 	unittest.main()
 

From fc72c4155678f2bca69d87a4fa8265479dfa0eaa Mon Sep 17 00:00:00 2001
From: Andrew Resch <andrewresch@gmail.com>
Date: Sun, 10 Jan 2016 19:57:20 -0800
Subject: [PATCH 2/2] Fix error with no converter for
 boost::shared_ptr<libtorrent::alert>

---
 bindings/python/src/session.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/bindings/python/src/session.cpp b/bindings/python/src/session.cpp
index 2bf60b49a..3b267d23a 100644
--- a/bindings/python/src/session.cpp
+++ b/bindings/python/src/session.cpp
@@ -583,6 +583,7 @@ namespace
 
 void bind_session()
 {
+    register_ptr_to_python<boost::shared_ptr<alert> >();
 #ifndef TORRENT_DISABLE_DHT
     void (lt::session::*dht_get_immutable_item)(sha1_hash const&) = &lt::session::dht_get_item;
     sha1_hash (lt::session::*dht_put_immutable_item)(entry data) = &lt::session::dht_put_item;