raise '123', 'blah'

and get a return status of 123.

Changed ftp server start up to bind to the given ip. Also added a commented out stanza showing how to turn on debug logging.

vocabularies.  redid Lexicon interface.

Changed 'password' and 'confirm' default values to use new User protocol for leaving password alone while changing roles/domains.

Modified _doChangeUser to leave password unchanged if the 'password' parameter is None.  _changeUser now always accepts "password == confirm == None", and sets 'password' to None if "password == 'password' and confirm == 'confirm'".

This gives Users an unambiguous protocol for both DTML and Python code to change roles/domains without touching the password.  editUser.dtml has a somewhat magical protocol, which users need not worry about.

createInObjectManager. There is probably a better solution.

Anthony's collector submission:

Title:  current cvs zcatalog lexicon/vocab support is broken

At: http://classic.zope.org:8080/Collector/Collector/1071/sview

Submitter:  Anthony Baxter

Description:  The current CVS version of ZCatalog has a couple of
              nasty bugs in it.

First off, the standard Lexicon uses a variable 'self.counter',
without ever initialising it. Oops.

Secondly, Catalog handles the default Lexicon inconsistently. In the
case of a lexicon being provided, it stores the name as self.lexicon,
otherwise it stores a Lexicon _object_ as self.lexicon. Later on, it
tries to do a getattr with the lexicon object as the second arg.

The first bug utterly breaks non-globbing Lexicons. The second bug
breaks textindexes that don't provide a lexicon at creation time.

A patch for both follows.  [Rather, this checkin commits both.]  Note
that the patch tries to handle gracefully existing Catalogs and
Lexicons that might be broken.

a mapping that is not a web request is passed in.

Added optional 'multipart' argument to dtml-mime, to allow specifying 'alternative' or whatever instead of 'mixed'.

Added check for streaming responses when determing whether to add a content-length header and setting a 204 response. This should fix the problem of streaming response having content-length 0 respone headers. Thanks to Toby Dickenson.

Added a lock to tempfile producers. Thanks to Toby Dickenson. This should avoid possible corruption of responses from FCGI and large HTTP responses.