From: Dyre Tjeldvoll Date: October 10 2012 7:26am Subject: bzr push into mysql-5.5-cluster-7.2 branch (Dyre.Tjeldvoll:4094 to 4095) List-Archive: http://lists.mysql.com/commits/144998 Message-Id: <20121010072626.1506.30979.4095@khepri17.no.oracle.com> MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit 4095 Dyre Tjeldvoll 2012-10-10 Fixing indentation errors modified: storage/ndb/mcc/request_handler.py 4094 Dyre Tjeldvoll 2012-10-09 Removed unused function and added missing docstr modified: storage/ndb/mcc/remote_clusterhost.py storage/ndb/mcc/util.py === modified file 'storage/ndb/mcc/request_handler.py' --- a/storage/ndb/mcc/request_handler.py 2012-10-09 11:07:34 +0000 +++ b/storage/ndb/mcc/request_handler.py 2012-10-10 07:25:52 +0000 @@ -295,13 +295,13 @@ def handle_getLogTailReq(req, body): def _parse_until_delim(ctx, fld, delim): """ Return False unless delim exists in ctx['str']. Assign ctx['str'] excluding delim to ctx[fld] and assign ctx[str] to the remainder, excluding delim, and return True otherwise.""" - i = ctx['str'].find(delim) - if (i == -1): - return False + i = ctx['str'].find(delim) + if (i == -1): + return False - ctx[fld] = ctx['str'][0:i] - ctx['str'] = ctx['str'][i+len(delim):] - return True + ctx[fld] = ctx['str'][0:i] + ctx['str'] = ctx['str'][i+len(delim):] + return True def parse_empty_line(ctx): """Return False unless ctx[str] starts with an empty line. Consume the empty line and return True otherwise.""" @@ -320,11 +320,11 @@ def parse_property(ctx): def parse_properties(ctx): """Return False unless ctx['str'] is a list of properties, a single property or an empty line. Parse the list of properties and return True otherwise.""" - return parse_property(ctx) and parse_properties(ctx) or parse_empty_line(ctx) + return parse_property(ctx) and parse_properties(ctx) or parse_empty_line(ctx) def parse_reply(ctx): """Return False unless ctx['str'] is an mgmd reply. Assign first line to ctx['reply_type], parse property list and return True otherwise.""" - return _parse_until_delim(ctx, 'reply_type', '\n') and parse_properties(ctx) + return _parse_until_delim(ctx, 'reply_type', '\n') and parse_properties(ctx) class mgmd_reply(dict): No bundle (reason: useless for push emails).