GitLab

The locking concept is generally useful and used outside of
the webdav context.

o Replaced  imports from the 'Globals' module throughout the tree with
  imports from the actual modules;  the 'Globals' module was always intended
  to be an area for shared data, rather than a "facade" for imports.

o Added 'zope.deferredimport.deprecation' entries to 'Globals/__init__.py'
  for all previously imported symbols / modules.

o Moved 'ApplicationdefaultPermissions' from 'App/class_init.py' to
  'AccessCoontrol/Permission.py', to avoid possible import cycle in
  third-party code.

o Moved canonical location of UNIQUE / REPLACEABLE / NOT_REPLACEABLE
  constants from 'Globals' to 'OFS.ObjectManager'.

o Removed 'stuffGlobals' hack in favor of the deferred / deprecation
  imports.

Moved 'alt' property from File to Image.
Fixes http://www.zope.org/Collectors/Zope/1907

Moved 'alt' property from File to Image.
Fixes http://www.zope.org/Collectors/Zope/1907

Fixes http://www.zope.org/Collectors/Zope/1907

OFS Image: Image and File updated to use isinstance(data, str) and raises TypeError upon encountering unicode objects.

OFS Image: Image and File updated to use isinstance(data, str) and raises TypeError upon encountering unicode objects.

OFS Image: Image and File now both support simple unicode objects for data (they function the same as strings for data).

OFS Image: Image and File now both support simple unicode objects for data (they function the same as strings for data).

and a corresponding Five trunk