vint: implement the typical pack() in C

[bup.git] / lib / bup / vint.py

diff --git a/lib/bup/vint.py b/lib/bup/vint.py
index a27204b0df268bad66f9cbcaa522ff49bc7b599d..fd8a8f0b369a2da24dc329fe0d76b64fe45bbe27 100644 (file)
--- a/lib/bup/vint.py
+++ b/lib/bup/vint.py
@@ -165,19 +165,21 @@ def recv(port, types):
     return result
 
 def pack(types, *args):
-    if len(types) != len(args):
-        raise Exception('number of arguments does not match format string')
-    ret = []
-    for (type, value) in zip(types, args):
-        if type == 'V':
-            ret.append(encode_vuint(value))
-        elif type == 'v':
-            ret.append(encode_vint(value))
-        elif type == 's':
-            ret.append(encode_bvec(value))
-        else:
-            raise Exception('unknown xpack format string item "' + type + '"')
-    return b''.join(ret)
+    try:
+        return _helpers.limited_vint_pack(types, args)
+    except OverflowError:
+        assert len(types) == len(args)
+        ret = []
+        for typ, value in zip(types, args):
+            if typ == 'V':
+                ret.append(encode_vuint(value))
+            elif typ == 'v':
+                ret.append(encode_vint(value))
+            elif typ == 's':
+                ret.append(encode_bvec(value))
+            else:
+                assert False
+        return b''.join(ret)
 
 def unpack(types, data):
     port = BytesIO(data)