summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2015-05-16 07:57:52 +0300
committerLars Wirzenius <liw@liw.fi>2015-05-16 10:33:53 +0300
commite6593887a74068fbdd811b035d31d461f9aac178 (patch)
tree8cf6ca268061fe87d6428329a7fbf1e1a3ca6616
parentea140f784253b6da9507428ad2e86a38678c4f36 (diff)
downloadobnam-e6593887a74068fbdd811b035d31d461f9aac178.tar.gz
Fix serialiser to handle long integers
-rw-r--r--obnamlib/obj_serialiser.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/obnamlib/obj_serialiser.py b/obnamlib/obj_serialiser.py
index a159091f..2fce4f94 100644
--- a/obnamlib/obj_serialiser.py
+++ b/obnamlib/obj_serialiser.py
@@ -79,10 +79,10 @@ def _deserialise_none(serialised):
_int_fmt = '!Q'
_int_size_serialised = _serialise_length(struct.calcsize(_int_fmt))
-def _serialise_int(obj):
+def _serialise_integer(obj):
return _INT + _int_size_serialised + struct.pack(_int_fmt, obj)
-def _deserialise_int(serialised):
+def _deserialise_integer(serialised):
return struct.unpack(_int_fmt, serialised)[0]
@@ -160,7 +160,8 @@ def _deserialise_prefix(serialised, pos):
_serialisers = {
type(None): _serialise_none,
- int: _serialise_int,
+ int: _serialise_integer,
+ long: _serialise_integer,
bool: _serialise_bool,
str: _serialise_str,
list: _serialise_list,
@@ -172,7 +173,7 @@ _serialisers = {
_deserialisers = {
_NONE: _deserialise_none,
- _INT: _deserialise_int,
+ _INT: _deserialise_integer,
_BOOL: _deserialise_bool,
_STR: _deserialise_str,
_LIST: _deserialise_list,