No commit message

Log message for revision 40576:
  No longer use the defaultLayer directive.  It didn't do anything anyway.

Log message for revision 40587:
  Update Five to 1.3c.

Log message for revision 40588:
  Fred fix a speling error in Zope 3.2.

Log message for revision 40590:
  sync with five repo

Log message for revision 40592:
  Zope 2's version.txt will from now on reside on the Zope2 package.
  The reason for that is because zpkg and distutils can't deal with arbitrary
  data files that don't belong to a certain package.

process actually still works.

ObjectManager now has an hasObject method to test presence. This
brings it in line with BTreeFolder.

ObjectManager now has an hasObject method to test presence. This
brings it in line with BTreeFolder.

- all conflict errors are counted and logged at info, as they were before Florent's change
- logging makes it clear where the conflict has been resolved and where it hasn't
- errors seen by the user are rendered with standard_error_message and are sent to the error_log which will likely copy them to the event log, depending on the users setup.
- also checking in a functional test for generating write conflict errors.

(I'll be committing to CHANGES.TXT shortly, I just wanted to keep the merges simpler)

- log at error when standard_error_message can't be rendered
- give more useful info about errors rendering standard_error_message to the browser.

Improved logging of ConflictErrors. Now a log is made at level BLATHER
with traceback for any conflict retried. In addition, a log is made at
level ERROR for a conflict that can't be retried anymore and is returned
to the browser as an error. Nothing is logged anymore at level INFO.

indexes do; this way one can simply re-catalog a site upgraded from a Zope 2.7
instance.

  
o The new tests are amphibious:  they exercise both the Python and the C
  implementations, ensuring that they remain in sync.

o The new tests are amphibious:  they exercise both the Python and the C
  implementations, ensuring that they remain in sync.

Added backward compat for suppress_events parameter passing.

Fixed problem with security.setPermissionDefault when the permission
wasn't used anywhere else in the class to protect methods.

wasn't used anywhere else in the class to protect methods.

Use ObjectCopiedEvent with an 'original' parameter.