[Zope3-checkins] CVS: Zope3/lib/python/Zope/App/OFS/Content/ZPTPage - ZPTPage.py:1.13 configure.zcml:1.11

Steve Alexander steve@cat-box.net
Tue, 12 Nov 2002 12:30:09 -0500


Update of /cvs-repository/Zope3/lib/python/Zope/App/OFS/Content/ZPTPage
In directory cvs.zope.org:/tmp/cvs-serv28634/lib/python/Zope/App/OFS/Content/ZPTPage

Modified Files:
	ZPTPage.py configure.zcml 
Log Message:
tidied up formatting. removed extraneous imports.


=== Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/ZPTPage.py 1.12 => 1.13 ===
--- Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/ZPTPage.py:1.12	Tue Nov 12 12:02:49 2002
+++ Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/ZPTPage.py	Tue Nov 12 12:30:09 2002
@@ -70,7 +70,6 @@
         '''See interface Zope.App.OFS.ZPTPage.ZPTPage.IZPTPage'''
         return self.read()
 
-
     def setSource(self, text, content_type='text/html'):
         '''See interface Zope.App.OFS.ZPTPage.ZPTPage.IZPTPage'''
         if isinstance(text, unicode):
@@ -78,7 +77,6 @@
         
         self.pt_edit(text, content_type)
 
-
     def pt_getContext(self, instance, request, **_kw):
         # instance is a View component
         namespace = super(ZPTPage, self).pt_getContext(**_kw)
@@ -101,7 +99,6 @@
         return self.pt_render(namespace)
 
     render = ContextMethod(render)
-    
 
     source = property(getSource, setSource, None,
                       """Source of the Page Template.""")


=== Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/configure.zcml 1.10 => 1.11 ===
--- Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/configure.zcml:1.10	Mon Nov 11 16:11:16 2002
+++ Zope3/lib/python/Zope/App/OFS/Content/ZPTPage/configure.zcml	Tue Nov 12 12:30:09 2002
@@ -1,33 +1,31 @@
 <zopeConfigure
    xmlns='http://namespaces.zope.org/zope'
-   xmlns:browser='http://namespaces.zope.org/browser'
 >
 
-  <content class=".ZPTPage.">
+<content class=".ZPTPage.">
+  <factory
+      id="ZPTPage"
+      permission="Zope.ManageContent"
+      title="ZPT Page"
+      description="A simple, content-based Page Template" />
+
+  <require
+      permission="Zope.View"
+      attributes="content_type __call__" />
+
+  <require
+      permission="Zope.ManageContent"
+      interface=".ZPTPage.IZPTPage"
+      set_attributes="source" />
+
+  <require
+      permission="Zope.View"
+      interface=".ZPTPage.IRenderZPTPage" />
+
+  <implements
+      interface="Zope.App.OFS.Annotation.IAttributeAnnotatable." />
+</content>
 
-    <factory
-        id="ZPTPage"
-        permission="Zope.ManageContent"
-        title="ZPT Page"
-        description="A simple, content-based Page Template" />
-
-    <require permission="Zope.View"
-                      attributes="content_type __call__" />
-
-    <require permission="Zope.ManageContent"
-                      interface=".ZPTPage.IZPTPage"
-                      set_attributes="source"
-                      />
-
-    <require permission="Zope.View"
-                      interface=".ZPTPage.IRenderZPTPage" />
-
-    <implements interface="Zope.App.OFS.Annotation.IAttributeAnnotatable." />
-
-  </content>
-
-
-
-  <include package=".Views" />
+<include package=".Views" />
 
 </zopeConfigure>