Log message for revision 67133: New import location of zope.app.contenttypes/zope.app.content_types.
Changed: U Zope/branches/philikon-local-components/lib/python/OFS/DTMLDocument.py U Zope/branches/philikon-local-components/lib/python/OFS/DTMLMethod.py U Zope/branches/philikon-local-components/lib/python/OFS/Image.py U Zope/branches/philikon-local-components/lib/python/Products/PageTemplates/ZopePageTemplate.py U Zope/branches/philikon-local-components/lib/python/ZClasses/Method.py U Zope/branches/philikon-local-components/lib/python/Zope2/Startup/handlers.py U Zope/branches/philikon-local-components/lib/python/webdav/NullResource.py -=- Modified: Zope/branches/philikon-local-components/lib/python/OFS/DTMLDocument.py =================================================================== --- Zope/branches/philikon-local-components/lib/python/OFS/DTMLDocument.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/OFS/DTMLDocument.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -17,7 +17,7 @@ from Globals import InitializeClass from ZPublisher.Converters import type_converters from Globals import HTML, DTMLFile, MessageDialog -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type from DTMLMethod import DTMLMethod, decapitate from PropertyManager import PropertyManager from webdav.common import rfc1123_date Modified: Zope/branches/philikon-local-components/lib/python/OFS/DTMLMethod.py =================================================================== --- Zope/branches/philikon-local-components/lib/python/OFS/DTMLMethod.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/OFS/DTMLMethod.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -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.contenttypes import guess_content_type +from zope.contenttype import guess_content_type from PropertyManager import PropertyManager from AccessControl import ClassSecurityInfo from AccessControl.Role import RoleManager Modified: Zope/branches/philikon-local-components/lib/python/OFS/Image.py =================================================================== --- Zope/branches/philikon-local-components/lib/python/OFS/Image.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/OFS/Image.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -15,7 +15,7 @@ $Id$ """ import struct -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type from Globals import DTMLFile from Globals import InitializeClass from PropertyManager import PropertyManager Modified: Zope/branches/philikon-local-components/lib/python/Products/PageTemplates/ZopePageTemplate.py =================================================================== --- Zope/branches/philikon-local-components/lib/python/Products/PageTemplates/ZopePageTemplate.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/Products/PageTemplates/ZopePageTemplate.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -20,7 +20,7 @@ import Acquisition from Globals import ImageFile, package_home, InitializeClass from OFS.SimpleItem import SimpleItem -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type from DateTime.DateTime import DateTime from Shared.DC.Scripts.Script import Script from Shared.DC.Scripts.Signature import FuncCode Modified: Zope/branches/philikon-local-components/lib/python/ZClasses/Method.py =================================================================== --- Zope/branches/philikon-local-components/lib/python/ZClasses/Method.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/ZClasses/Method.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -25,7 +25,7 @@ import marshal from cgi import escape -from zope.app.contenttypes import guess_content_type +from zope.contenttype import guess_content_type _marker=[] class ZClassMethodsSheet( Modified: Zope/branches/philikon-local-components/lib/python/Zope2/Startup/handlers.py =================================================================== --- Zope/branches/philikon-local-components/lib/python/Zope2/Startup/handlers.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/Zope2/Startup/handlers.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -175,7 +175,7 @@ # Augment the set of MIME types: if config.mime_types: - from zope.app.contenttypes import add_files + from zope.contenttype import add_files add_files(config.mime_types) # if no servers are defined, create default http server and ftp server Modified: Zope/branches/philikon-local-components/lib/python/webdav/NullResource.py =================================================================== --- Zope/branches/philikon-local-components/lib/python/webdav/NullResource.py 2006-04-19 13:57:45 UTC (rev 67132) +++ Zope/branches/philikon-local-components/lib/python/webdav/NullResource.py 2006-04-19 14:01:59 UTC (rev 67133) @@ -39,7 +39,7 @@ from Resource import Resource from WriteLockInterface import WriteLockInterface -from zope.app.contenttypes import guess_content_type +from zope.contenttype 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