[Zodb-checkins] CVS: StandaloneZODB/ZEO - ClientStorage.py:1.26.4.31

[Jeremy Hylton]

Update of /cvs-repository/StandaloneZODB/ZEO
In directory cvs.zope.org:/tmp/cvs-serv24647

Modified Files:
      Tag: ZEO-ZRPC-Dev
	ClientStorage.py 
Log Message:
Cleanup constructor a bit.

Remove some un-used instance variables.
Put related uses of constructor args next to each other.


=== StandaloneZODB/ZEO/ClientStorage.py 1.26.4.30 => 1.26.4.31 ===
                  wait_for_server_on_startup=1):
 
-        # Decide whether to use non-temporary files
-        client = client or os.environ.get('ZEO_CLIENT','')
-
         self._server = disconnected_stub
         self._is_read_only = read_only
-        self._connection = addr
         self._storage = storage
-        self._debug = debug
 
         self._info = {'length': 0, 'size': 0, 'name': 'ZEO Client',
                       'supportsUndo':0, 'supportsVersions': 0}
 
-        name = name or str(addr)
-
         self._tbuf = TransactionBuffer()
+        self._db = None
         self._oids = []
         # XXX It's confusing to have _serial, _serials, and _seriald. 
         self._serials = []
         self._seriald = {}
 
-        self._basic_init(name)
+        self._basic_init(name or str(addr))
 
-        self._db = None
+        # Decide whether to use non-temporary files
+        client = client or os.environ.get('ZEO_CLIENT','')
         self._cache = ClientCache.ClientCache(storage, cache_size,
                                               client=client, var=var)
         self._cache.open() # XXX