[Neo-report] r2311 gregory - in /trunk/neo: protocol.py tests/storage/testStorageMySQLdb.py

[nobody at svn.erp5.org]

Author: gregory
Date: Fri Sep 24 10:24:38 2010
New Revision: 2311

Log:
Drop INVALID_PTID constant, replaced in memory by a None value.

Modified:
    trunk/neo/protocol.py
    trunk/neo/tests/storage/testStorageMySQLdb.py

Modified: trunk/neo/protocol.py
==============================================================================
--- trunk/neo/protocol.py [iso-8859-1] (original)
+++ trunk/neo/protocol.py [iso-8859-1] Fri Sep 24 10:24:38 2010
@@ -107,7 +107,6 @@ cell_state_prefix_dict = {
 INVALID_UUID = '\0' * 16
 INVALID_TID = '\xff' * 8
 INVALID_OID = '\xff' * 8
-INVALID_PTID = '\0' * 8
 INVALID_SERIAL = INVALID_TID
 INVALID_PARTITION = 0xffffffff
 ZERO_TID = '\0' * 8
@@ -200,13 +199,14 @@ def _encodeUUID(uuid):
     return uuid
 
 def _decodePTID(ptid):
-    if ptid == INVALID_PTID:
+    ptid = unpack('!Q', ptid)[0]
+    if ptid == 0:
         return None
-    return unpack('!Q', ptid)[0]
+    return ptid
 
 def _encodePTID(ptid):
     if ptid is None:
-        return INVALID_PTID
+        ptid = 0
     assert isinstance(ptid, (int, long)), ptid
     return pack('!Q', ptid)
 

Modified: trunk/neo/tests/storage/testStorageMySQLdb.py
==============================================================================
--- trunk/neo/tests/storage/testStorageMySQLdb.py [iso-8859-1] (original)
+++ trunk/neo/tests/storage/testStorageMySQLdb.py [iso-8859-1] Fri Sep 24 10:24:38 2010
@@ -19,7 +19,7 @@ import unittest
 import MySQLdb
 from mock import Mock
 from neo.util import dump, p64, u64
-from neo.protocol import CellStates, INVALID_PTID, ZERO_OID, ZERO_TID, MAX_TID
+from neo.protocol import CellStates, ZERO_OID, ZERO_TID, MAX_TID
 from neo.tests import NeoTestBase
 from neo.exception import DatabaseFailure
 from neo.storage.database.mysqldb import MySQLDatabaseManager