Log message for revision 40976: content_types -> contenttypes Changed: U Zope/trunk/lib/python/App/ImageFile.py U Zope/trunk/lib/python/OFS/DTMLDocument.py U Zope/trunk/lib/python/OFS/DTMLMethod.py U Zope/trunk/lib/python/OFS/Image.py U Zope/trunk/lib/python/OFS/content_types.py U Zope/trunk/lib/python/ZClasses/Method.py U Zope/trunk/lib/python/webdav/NullResource.py
-=- Modified: Zope/trunk/lib/python/App/ImageFile.py =================================================================== --- Zope/trunk/lib/python/App/ImageFile.py 2005-12-22 11:04:29 UTC (rev 40975) +++ Zope/trunk/lib/python/App/ImageFile.py 2005-12-22 11:08:31 UTC (rev 40976) @@ -26,7 +26,7 @@ from Common import rfc1123_date from DateTime import DateTime -from zope.app.content_types import guess_content_type +from zope.app.contenttypes import guess_content_type class ImageFile(Acquisition.Explicit): """Image objects stored in external files.""" Modified: Zope/trunk/lib/python/OFS/DTMLDocument.py =================================================================== --- Zope/trunk/lib/python/OFS/DTMLDocument.py 2005-12-22 11:04:29 UTC (rev 40975) +++ Zope/trunk/lib/python/OFS/DTMLDocument.py 2005-12-22 11:08:31 UTC (rev 40976) @@ -17,7 +17,7 @@ from Globals import InitializeClass from ZPublisher.Converters import type_converters from Globals import HTML, DTMLFile, MessageDialog -from zope.app.content_types import guess_content_type +from zope.app.contenttypes import guess_content_type from DTMLMethod import DTMLMethod, decapitate from PropertyManager import PropertyManager from webdav.common import rfc1123_date Modified: Zope/trunk/lib/python/OFS/DTMLMethod.py =================================================================== --- Zope/trunk/lib/python/OFS/DTMLMethod.py 2005-12-22 11:04:29 UTC (rev 40975) +++ Zope/trunk/lib/python/OFS/DTMLMethod.py 2005-12-22 11:08:31 UTC (rev 40976) @@ -18,7 +18,7 @@ from Globals import HTML, DTMLFile, MessageDialog from Globals import InitializeClass from SimpleItem import Item_w__name__, pretty_tb -from zope.app.content_types import guess_content_type +from zope.app.contenttypes import guess_content_type from PropertyManager import PropertyManager from AccessControl import ClassSecurityInfo from AccessControl.Role import RoleManager Modified: Zope/trunk/lib/python/OFS/Image.py =================================================================== --- Zope/trunk/lib/python/OFS/Image.py 2005-12-22 11:04:29 UTC (rev 40975) +++ Zope/trunk/lib/python/OFS/Image.py 2005-12-22 11:08:31 UTC (rev 40976) @@ -15,7 +15,7 @@ $Id$ """ import struct -from zope.app.content_types import guess_content_type +from zope.app.contenttypes import guess_content_type from Globals import DTMLFile from Globals import InitializeClass from PropertyManager import PropertyManager Modified: Zope/trunk/lib/python/OFS/content_types.py =================================================================== --- Zope/trunk/lib/python/OFS/content_types.py 2005-12-22 11:04:29 UTC (rev 40975) +++ Zope/trunk/lib/python/OFS/content_types.py 2005-12-22 11:08:31 UTC (rev 40976) @@ -17,8 +17,8 @@ import warnings warnings.warn('Using OFS.content_types is deprecated (will be removed in Zope ' - '2.11). Instead use zope.app.content_types.', + '2.11). Instead use zope.app.contenttypes.', DeprecationWarning, stacklevel=2) -from zope.app.content_types import text_type, guess_content_type, add_files +from zope.app.contenttypes import text_type, guess_content_type, add_files Modified: Zope/trunk/lib/python/ZClasses/Method.py =================================================================== --- Zope/trunk/lib/python/ZClasses/Method.py 2005-12-22 11:04:29 UTC (rev 40975) +++ Zope/trunk/lib/python/ZClasses/Method.py 2005-12-22 11:08:31 UTC (rev 40976) @@ -25,7 +25,7 @@ import marshal from cgi import escape -from zope.app.content_types import guess_content_type +from zope.app.contenttypes import guess_content_type _marker=[] class ZClassMethodsSheet( Modified: Zope/trunk/lib/python/webdav/NullResource.py =================================================================== --- Zope/trunk/lib/python/webdav/NullResource.py 2005-12-22 11:04:29 UTC (rev 40975) +++ Zope/trunk/lib/python/webdav/NullResource.py 2005-12-22 11:08:31 UTC (rev 40976) @@ -39,7 +39,7 @@ from Resource import Resource from WriteLockInterface import WriteLockInterface -from zope.app.content_types import guess_content_type +from zope.app.contenttypes import guess_content_type class NullResource(Persistent, Acquisition.Implicit, Resource): _______________________________________________ Zope-Checkins maillist - Zope-Checkins@zope.org http://mail.zope.org/mailman/listinfo/zope-checkins