Log message for revision 40211: Merge r40210 from Zope 2.9 branch: Deprecated the ImageFile module for good. It will be removed in Zope 2.11.
Changed: U Zope/trunk/doc/CHANGES.txt U Zope/trunk/lib/python/ImageFile.py U Zope/trunk/lib/python/Products/OFSP/__init__.py U Zope/trunk/lib/python/Products/SiteErrorLog/__init__.py -=- Modified: Zope/trunk/doc/CHANGES.txt =================================================================== --- Zope/trunk/doc/CHANGES.txt 2005-11-18 13:25:28 UTC (rev 40210) +++ Zope/trunk/doc/CHANGES.txt 2005-11-18 13:28:29 UTC (rev 40211) @@ -92,6 +92,9 @@ non-existing or closed database connection next to the Connection ID 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 - The '@' character is now allowed in object ids (RFC 1738 allows it). Modified: Zope/trunk/lib/python/ImageFile.py =================================================================== --- Zope/trunk/lib/python/ImageFile.py 2005-11-18 13:25:28 UTC (rev 40210) +++ Zope/trunk/lib/python/ImageFile.py 2005-11-18 13:28:29 UTC (rev 40211) @@ -14,12 +14,10 @@ __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 +import warnings +warnings.warn("The ImageFile module will be removed in Zope 2.11. " + "Use App.ImageFile instead.", DeprecationWarning, stacklevel=2) Modified: Zope/trunk/lib/python/Products/OFSP/__init__.py =================================================================== --- Zope/trunk/lib/python/Products/OFSP/__init__.py 2005-11-18 13:25:28 UTC (rev 40210) +++ Zope/trunk/lib/python/Products/OFSP/__init__.py 2005-11-18 13:28:29 UTC (rev 40211) @@ -22,7 +22,7 @@ from AccessControl.Permissions import add_documents_images_and_files from AccessControl.Permissions import add_folders from ZClasses import createZClassForBase -from ImageFile import ImageFile +from App.ImageFile import ImageFile createZClassForBase( OFS.DTMLMethod.DTMLMethod, globals() , 'ZDTMLMethod', 'DTML Method' ) Modified: Zope/trunk/lib/python/Products/SiteErrorLog/__init__.py =================================================================== --- Zope/trunk/lib/python/Products/SiteErrorLog/__init__.py 2005-11-18 13:25:28 UTC (rev 40210) +++ Zope/trunk/lib/python/Products/SiteErrorLog/__init__.py 2005-11-18 13:28:29 UTC (rev 40211) @@ -17,7 +17,7 @@ """ import SiteErrorLog -from ImageFile import ImageFile +from App.ImageFile import ImageFile misc_={ 'ok.gif': ImageFile('www/ok.gif', globals()), _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins