Commit 96b296e1 authored by Jeremy Hylton's avatar Jeremy Hylton

Add default arguments to undoInfo(), since the storage API (the tests

    at least) seems to imply that they are optional.
Fix typo in long attribute name.
parent e1929d2a
...@@ -84,7 +84,7 @@ ...@@ -84,7 +84,7 @@
############################################################################## ##############################################################################
"""Network ZODB storage client """Network ZODB storage client
""" """
__version__='$Revision: 1.27 $'[11:-2] __version__='$Revision: 1.28 $'[11:-2]
import struct, time, os, socket, string, Sync, zrpc, ClientCache import struct, time, os, socket, string, Sync, zrpc, ClientCache
import tempfile, Invalidator, ExtensionClass, thread import tempfile, Invalidator, ExtensionClass, thread
...@@ -120,7 +120,7 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage): ...@@ -120,7 +120,7 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage):
def __init__(self, connection, storage='1', cache_size=20000000, def __init__(self, connection, storage='1', cache_size=20000000,
name='', client='', debug=0, var=None, name='', client='', debug=0, var=None,
min_disconnect_poll=5, max_disconnect_poll=300, min_disconnect_poll=5, max_disconnect_poll=300,
wait_for_server_on_starup=1): wait_for_server_on_startup=1):
# Decide whether to use non-temporary files # Decide whether to use non-temporary files
client=client or os.environ.get('ZEO_CLIENT','') client=client or os.environ.get('ZEO_CLIENT','')
...@@ -128,7 +128,7 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage): ...@@ -128,7 +128,7 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage):
self._connection=connection self._connection=connection
self._storage=storage self._storage=storage
self._debug=debug self._debug=debug
self._wait_for_server_on_starup=wait_for_server_on_starup self._wait_for_server_on_startup=wait_for_server_on_startup
self._info={'length': 0, 'size': 0, 'name': 'ZEO Client', self._info={'length': 0, 'size': 0, 'name': 'ZEO Client',
'supportsUndo':0, 'supportsVersions': 0, 'supportsUndo':0, 'supportsVersions': 0,
...@@ -198,7 +198,7 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage): ...@@ -198,7 +198,7 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage):
def _startup(self): def _startup(self):
if not self._call.connect(not self._wait_for_server_on_starup): if not self._call.connect(not self._wait_for_server_on_startup):
# If we can't connect right away, go ahead and open the cache # If we can't connect right away, go ahead and open the cache
# and start a separate thread to try and reconnect. # and start a separate thread to try and reconnect.
...@@ -542,7 +542,7 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage): ...@@ -542,7 +542,7 @@ class ClientStorage(ExtensionClass.Base, BaseStorage.BaseStorage):
finally: self._lock_release() finally: self._lock_release()
def undoInfo(self, first, last, specification): def undoInfo(self, first=0, last=-20, specification=None):
self._lock_acquire() self._lock_acquire()
try: try:
return self._call('undoInfo', first, last, specification) return self._call('undoInfo', first, last, specification)
......
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