Implement object_pairs_hook

2 files changed, 13 insertions, 4 deletions

diff --git a/test/test_obj.py b/test/test_obj.py
index d155b73..e0d89fc 100644
--- a/test/test_obj.py
+++ b/test/test_obj.py
@@ -26,6 +26,16 @@ def test_decode_hook():
     unpacked = unpackb(packed, object_hook=_decode_complex)
     eq_(unpacked[1], 1+2j)
 
+def test_decode_pairs_hook():
+    packed = packb([3, {1: 2, 3: 4}])
+    prod_sum = 1 * 2 + 3 * 4
+    unpacked = unpackb(packed, object_pairs_hook=lambda l: sum(k * v for k, v in l))
+    eq_(unpacked[1], prod_sum)
+
+@raises(ValueError)
+def test_only_one_obj_hook():
+    unpackb('', object_hook=lambda x: x, object_pairs_hook=lambda x: x)
+
 @raises(ValueError)
 def test_bad_hook():
     packed = packb([3, 1+2j], default=lambda o: o)
diff --git a/test/test_pack.py b/test/test_pack.py
index b216c46..2c99873 100644
--- a/test/test_pack.py
+++ b/test/test_pack.py
@@ -111,10 +111,9 @@ def test_odict():
     seq = [(b'one', 1), (b'two', 2), (b'three', 3), (b'four', 4)]
     od = odict(seq)
     assert_equal(unpackb(packb(od)), dict(seq))
-    # After object_pairs_hook is implemented.
-    #def pair_hook(seq):
-    #    return seq
-    #assert_equal(unpackb(packb(od), object_pairs_hook=pair_hook), seq)
+    def pair_hook(seq):
+        return seq
+    assert_equal(unpackb(packb(od), object_pairs_hook=pair_hook), seq)
 
 
 if __name__ == '__main__':