Thanks to Tim Peters for pointing out the flaw!

o ZODB 3.6 properly removed it, but Zope needs to keep it for another release
  because ZODB released *twice* during the Zope 2.9 release cycle.

first beta due to the now zpkg-based build and release process.

No commit message

The reason for that is because zpkg and distutils can't deal with arbitrary
data files that don't belong to a certain package.

exits.

brings it in line with BTreeFolder.

  - change SimpleItem.py to use python logging module
  - log at error when standard_error_message can't be rendered
  - give more useful info about errors rendering standard_error_message to the browser.
  - all conflict errors are counted and logged at info
  - 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)

- remove unused import.
- change SimpleItem.py to use python logging module
- log at error when standard_error_message can't be rendered
- give more useful info about errors rendering standard_error_message to the browser.
- all conflict errors are counted and logged at info
- 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)

- 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.

We now check ownership and proxy roles if an executable object is on the stack.

Note that we have removed the C implementation of 'checkPermission'.

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.

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.