From 41108583c732ccf43f382ccb41dab9782ea116ad Mon Sep 17 00:00:00 2001 From: Dave Schuyler Date: Fri, 17 Dec 2004 01:32:53 +0000 Subject: [PATCH] formatting --- direct/src/dcparser/dcArrayParameter.cxx | 1 - direct/src/distributed/ConnectionRepository.py | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/direct/src/dcparser/dcArrayParameter.cxx b/direct/src/dcparser/dcArrayParameter.cxx index df6b880775..887c431bdb 100644 --- a/direct/src/dcparser/dcArrayParameter.cxx +++ b/direct/src/dcparser/dcArrayParameter.cxx @@ -275,7 +275,6 @@ pack_default_value(DCPackData &pack_data, bool &pack_error) const { packer.pop(); if (!packer.end_pack()) { pack_error = true; - } else { pack_data.append_data(packer.get_data(), packer.get_length()); } diff --git a/direct/src/distributed/ConnectionRepository.py b/direct/src/distributed/ConnectionRepository.py index 4dc6df73c7..884fafd84a 100644 --- a/direct/src/distributed/ConnectionRepository.py +++ b/direct/src/distributed/ConnectionRepository.py @@ -165,7 +165,7 @@ class ConnectionRepository(DirectObject.DirectObject, CConnectionRepository): components = moduleName.split('.') dcImports[components[0]] = module - def connect(self, serverList, + def connect(self, serverList, successCallback = None, successArgs = [], failureCallback = None, failureArgs = []): """ @@ -223,10 +223,10 @@ class ConnectionRepository(DirectObject.DirectObject, CConnectionRepository): # run out of servers). ch = self.http.makeChannel(0) - self.httpConnectCallback(ch, serverList, 0, - successCallback, successArgs, - failureCallback, failureArgs) - + self.httpConnectCallback( + ch, serverList, 0, + successCallback, successArgs, + failureCallback, failureArgs) else: # Try each of the servers in turn. for url in serverList: @@ -274,7 +274,6 @@ class ConnectionRepository(DirectObject.DirectObject, CConnectionRepository): self.startReaderPollTask() if successCallback: successCallback(*successArgs) - elif serverIndex < len(serverList): # No connection yet, but keep trying.