Commit 28f7a924 authored by Jim Fulton's avatar Jim Fulton

When checking protocol, need to ignore encoding character

parent 13438d92
...@@ -383,7 +383,7 @@ class ClientStorage(ZODB.ConflictResolution.ConflictResolvingStorage): ...@@ -383,7 +383,7 @@ class ClientStorage(ZODB.ConflictResolution.ConflictResolvingStorage):
'interfaces', ()): 'interfaces', ()):
zope.interface.alsoProvides(self, iface) zope.interface.alsoProvides(self, iface)
if self.protocol_version >= b'Z5': if self.protocol_version[1:] >= b'5':
self.ping = lambda : self._call('ping') self.ping = lambda : self._call('ping')
else: else:
self.ping = lambda : self._call('lastTransaction') self.ping = lambda : self._call('lastTransaction')
......
...@@ -228,7 +228,7 @@ class ZEOStorage: ...@@ -228,7 +228,7 @@ class ZEOStorage:
storage = self.storage storage = self.storage
supportsUndo = (getattr(storage, 'supportsUndo', lambda : False)() supportsUndo = (getattr(storage, 'supportsUndo', lambda : False)()
and self.connection.protocol_version >= b'Z310') and self.connection.protocol_version[1:] >= b'310')
# Communicate the backend storage interfaces to the client # Communicate the backend storage interfaces to the client
storage_provides = zope.interface.providedBy(storage) storage_provides = zope.interface.providedBy(storage)
......
...@@ -39,7 +39,7 @@ class StorageServer: ...@@ -39,7 +39,7 @@ class StorageServer:
""" """
def __init__(self, test, storage, def __init__(self, test, storage,
protocol_version=best_protocol_version, protocol_version=b'Z' + best_protocol_version,
**kw): **kw):
self.test = test self.test = test
self.storage_server = ZEO.StorageServer.StorageServer( self.storage_server = ZEO.StorageServer.StorageServer(
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment