Merge branch '0.9'

Conflicts:
	kafka/codec.py
	kafka/version.py
	test/test_producer.py
	test/test_producer_integration.py

1 files changed, 29 insertions, 0 deletions

diff --git a/kafka/protocol/pickle.py b/kafka/protocol/pickle.py
new file mode 100644
index 0000000..b7e5264
--- /dev/null
+++ b/kafka/protocol/pickle.py
@@ -0,0 +1,29 @@
+from __future__ import absolute_import
+
+try:
+    import copyreg  # pylint: disable=import-error
+except ImportError:
+    import copy_reg as copyreg  # pylint: disable=import-error
+
+import types
+
+
+def _pickle_method(method):
+    func_name = method.im_func.__name__
+    obj = method.im_self
+    cls = method.im_class
+    return _unpickle_method, (func_name, obj, cls)
+
+
+def _unpickle_method(func_name, obj, cls):
+    for cls in cls.mro():
+        try:
+            func = cls.__dict__[func_name]
+        except KeyError:
+            pass
+        else:
+            break
+        return func.__get__(obj, cls)
+
+# https://bytes.com/topic/python/answers/552476-why-cant-you-pickle-instancemethods
+copyreg.pickle(types.MethodType, _pickle_method, _unpickle_method)