Move add64 to neo.util module.

git-svn-id: https://svn.erp5.org/repos/neo/trunk@2473 71dcc9de-d417-0410-9af5-da40c76e7ee4

neo/storage/handlers/replication.py

@@ -20,7 +20,7 @@ import neo
 
 from neo.handler import EventHandler
 from neo.protocol import Packets, ZERO_TID, ZERO_OID
-from neo import util
+from neo.util import add64
 
 # TODO: benchmark how different values behave
 RANGE_LENGTH = 4000
@@ -78,10 +78,6 @@ def checkConnectionIsReplicatorConnection(func):
         return result
     return decorator
 
-def add64(packed, offset):
-    """Add a python number to a 64-bits packed value"""
-    return util.p64(util.u64(packed) + offset)
-
 class ReplicationHandler(EventHandler):
     """This class handles events for replications."""
 

neo/tests/storage/testReplicationHandler.py

@@ -17,9 +17,10 @@
 
 import unittest
 from mock import Mock
+from neo.util import add64
 from neo.tests import NeoUnitTestBase
 from neo.protocol import Packets, ZERO_OID, ZERO_TID
-from neo.storage.handlers.replication import ReplicationHandler, add64
+from neo.storage.handlers.replication import ReplicationHandler
 from neo.storage.handlers.replication import RANGE_LENGTH, MIN_RANGE_LENGTH
 
 class FakeDict(object):

neo/util.py

@@ -28,6 +28,10 @@ def u64(s):
 def p64(n):
     return pack('!Q', n)
 
+def add64(packed, offset):
+    """Add a python number to a 64-bits packed value"""
+    return p64(u64(packed) + offset)
+
 def dump(s):
     """Dump a binary string in hex."""
     if s is None: