Merge r40210 from Zope 2.9 branch:

  Deprecated the ImageFile module for good. It will be removed in Zope 2.11.
parent 3c79f800
...@@ -92,6 +92,9 @@ Zope Changes ...@@ -92,6 +92,9 @@ Zope Changes
non-existing or closed database connection next to the Connection ID non-existing or closed database connection next to the Connection ID
dropdown and present it using red to increase its visibility. dropdown and present it using red to increase its visibility.
- The ImageFile module has finally been deprecated for good and
will be removed in Zope 2.11. Use App.ImageFile instead.
after Zope 2.8.1 after Zope 2.8.1
- The '@' character is now allowed in object ids (RFC 1738 allows it). - The '@' character is now allowed in object ids (RFC 1738 allows it).
......
...@@ -14,12 +14,10 @@ ...@@ -14,12 +14,10 @@
__version__='$Revision: 1.13 $'[11:-2] __version__='$Revision: 1.13 $'[11:-2]
############################################################ ############################################################
# BBB 2005/11/18 -- This module will be removed in Zope 2.11
# #
# Eventually this module will go away!
#
############################################################
from App.ImageFile import ImageFile from App.ImageFile import ImageFile
import warnings
warnings.warn("The ImageFile module will be removed in Zope 2.11. "
"Use App.ImageFile instead.", DeprecationWarning, stacklevel=2)
...@@ -22,7 +22,7 @@ import ZClasses.ObjectManager ...@@ -22,7 +22,7 @@ import ZClasses.ObjectManager
from AccessControl.Permissions import add_documents_images_and_files from AccessControl.Permissions import add_documents_images_and_files
from AccessControl.Permissions import add_folders from AccessControl.Permissions import add_folders
from ZClasses import createZClassForBase from ZClasses import createZClassForBase
from ImageFile import ImageFile from App.ImageFile import ImageFile
createZClassForBase( OFS.DTMLMethod.DTMLMethod, globals() createZClassForBase( OFS.DTMLMethod.DTMLMethod, globals()
, 'ZDTMLMethod', 'DTML Method' ) , 'ZDTMLMethod', 'DTML Method' )
......
...@@ -17,7 +17,7 @@ $Id$ ...@@ -17,7 +17,7 @@ $Id$
""" """
import SiteErrorLog import SiteErrorLog
from ImageFile import ImageFile from App.ImageFile import ImageFile
misc_={ misc_={
'ok.gif': ImageFile('www/ok.gif', globals()), 'ok.gif': ImageFile('www/ok.gif', globals()),
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment