[Zope3-checkins] CVS: Zope3/src/zope/app/content - dtmlpage.py:1.1.2.5

[Fred L. Drake, Jr.]

Update of /cvs-repository/Zope3/src/zope/app/content
In directory cvs.zope.org:/tmp/cvs-serv23537

Modified Files:
      Tag: NameGeddon-branch
	dtmlpage.py 
Log Message:
- import cleanup
- whitespace normalization


=== Zope3/src/zope/app/content/dtmlpage.py 1.1.2.4 => 1.1.2.5 ===
--- Zope3/src/zope/app/content/dtmlpage.py:1.1.2.4	Tue Dec 24 07:51:00 2002
+++ Zope3/src/zope/app/content/dtmlpage.py	Tue Dec 24 09:55:53 2002
@@ -2,35 +2,36 @@
 #
 # Copyright (c) 2001, 2002 Zope Corporation and Contributors.
 # All Rights Reserved.
-# 
+#
 # This software is subject to the provisions of the Zope Public License,
 # Version 2.0 (ZPL).  A copy of the ZPL should accompany this distribution.
 # THIS SOFTWARE IS PROVIDED "AS IS" AND ANY AND ALL EXPRESS OR IMPLIED
 # WARRANTIES ARE DISCLAIMED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
 # WARRANTIES OF TITLE, MERCHANTABILITY, AGAINST INFRINGEMENT, AND FITNESS
 # FOR A PARTICULAR PURPOSE.
-# 
+#
 ##############################################################################
 """
 $Id$
 """
-from zope.interface import Interface, Attribute
 import zope.schema
+
 from persistence import Persistent
 
+from zope.interface import Interface, Attribute
+from zope.app.interfaces.annotation import IAnnotatable
+from zope.app.interfaces.content.file import IFileContent
+
 from zope.proxy.context import ContextMethod
 from zope.proxy.context import getWrapperContainer
 from zope.security.proxy import ProxyFactory
 
-from zope.documenttemplate.pdocumenttemplate import MultiMapping
 from zope.documenttemplate.dt_html import HTML
-from zope.app.interfaces.annotation import IAnnotatable
-from zope.app.interfaces.content.file import IFileContent
 
 
 class IDTMLPage(Interface):
     """DTML Pages are a persistent implementation of DTML."""
-    
+
     def setSource(text, content_type='text/html'):
         """Save the source of the page template."""
 
@@ -62,7 +63,6 @@
     # XXX Putting IFileContent at the end gives an error!
     __implements__ = IFileContent, IDTMLPage, IRenderDTMLPage, IAnnotatable
 
-
     def __init__(self, source=''):
         self.setSource(source)
 
@@ -80,7 +80,7 @@
 
         instance = ProxyFactory(getWrapperContainer(self))
         request = ProxyFactory(request)
-        
+
         for k in kw:
             kw[k] = ProxyFactory(kw[k])
         kw['REQUEST'] = request