content_types -> contenttypes

lib/python/App/ImageFile.py

@@ -26,7 +26,7 @@ from Globals import package_home
 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."""

lib/python/OFS/DTMLDocument.py

@@ -17,7 +17,7 @@ $Id$
 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

lib/python/OFS/DTMLMethod.py

@@ -18,7 +18,7 @@ import History
 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

lib/python/OFS/Image.py

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

lib/python/OFS/content_types.py

@@ -17,8 +17,8 @@ $Id$
 
 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

lib/python/ZClasses/Method.py

@@ -25,7 +25,7 @@ from zExceptions import BadRequest
 
 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(

lib/python/webdav/NullResource.py

@@ -39,7 +39,7 @@ from interfaces import IWriteLock
 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):