Merge branch 'develop' into issue-20

CHANGELOG.md

 ## v2.0.22rc3
 
 * fixes #20
+* fixes #21
 
 ## v2.0.22rc2
 

satella/instrumentation/trace_back.py

@@ -232,9 +232,15 @@ class Traceback(object):
 
             self.formatted_traceback = six.text_type(traceback.format_exc())
 
+    def pickle_to(self, stream):
+        """Pickle self to target stream"""
+        pickle.dump(self, stream, pickle.HIGHEST_PROTOCOL)
+
     def pickle(self):
         """Returns this instance, pickled"""
-        return pickle.dumps(self, pickle.HIGHEST_PROTOCOL)
+        bio = io.BytesIO()
+        self.pickle_to(bio)
+        return bio.getvalue()
 
     def pretty_format(self):
         """

tests/test_instrumentation/test_trace_back.py

@@ -23,7 +23,15 @@ class TestTraceback(unittest.TestCase):
             p_fmt = tb.pretty_format()
 
         self.assertTrue(p_fmt)
-        print(p_fmt)
+
+    def test_issue_21(self):
+        try:
+            loc = u'hello world'
+            raise ValueError(u'hello')
+        except ValueError:
+            tb = Traceback()
+            a = tb.pickle()
+            self.assertIsInstance(pickle.loads(a), Traceback)
 
     def test_compression_happens(self):