[Checkins] SVN: GenericSetup/trunk/PageTemplates/ - just provide support for ZopePageTemplate, not for PageTemplate (this way we don't need the meta_type hack)

[Yvo Schubbe]

Log message for revision 68406:
  - just provide support for ZopePageTemplate, not for PageTemplate (this way we don't need the meta_type hack)

Changed:
  U   GenericSetup/trunk/PageTemplates/configure.zcml
  U   GenericSetup/trunk/PageTemplates/exportimport.py
  U   GenericSetup/trunk/PageTemplates/interfaces.py
  U   GenericSetup/trunk/PageTemplates/tests/test_exportimport.py

-=-
Modified: GenericSetup/trunk/PageTemplates/configure.zcml
===================================================================
--- GenericSetup/trunk/PageTemplates/configure.zcml	2006-05-31 09:47:45 UTC (rev 68405)
+++ GenericSetup/trunk/PageTemplates/configure.zcml	2006-05-31 10:12:09 UTC (rev 68406)
@@ -4,15 +4,15 @@
     >
 
   <adapter
-      factory=".exportimport.PageTemplateBodyAdapter"
+      factory=".exportimport.ZopePageTemplateBodyAdapter"
       provides="Products.GenericSetup.interfaces.IBody"
-      for=".interfaces.IPageTemplate
+      for=".interfaces.IZopePageTemplate
            Products.GenericSetup.interfaces.ISetupEnviron"
       />
 
   <five:implements
-      class="Products.PageTemplates.PageTemplate.PageTemplate"
-      interface=".interfaces.IPageTemplate"
+      class="Products.PageTemplates.ZopePageTemplate.ZopePageTemplate"
+      interface=".interfaces.IZopePageTemplate"
       />
 
 </configure>

Modified: GenericSetup/trunk/PageTemplates/exportimport.py
===================================================================
--- GenericSetup/trunk/PageTemplates/exportimport.py	2006-05-31 09:47:45 UTC (rev 68405)
+++ GenericSetup/trunk/PageTemplates/exportimport.py	2006-05-31 10:12:09 UTC (rev 68406)
@@ -17,26 +17,20 @@
 
 from Products.GenericSetup.utils import BodyAdapterBase
 
-from interfaces import IPageTemplate
+from interfaces import IZopePageTemplate
 
 
-class PageTemplateBodyAdapter(BodyAdapterBase):
+class ZopePageTemplateBodyAdapter(BodyAdapterBase):
 
-    """Body im- and exporter for PageTemplate.
+    """Body im- and exporter for ZopePageTemplate.
     """
 
-    __used_for__ = IPageTemplate
+    __used_for__ = IZopePageTemplate
 
-    mime_type = 'text/html'
-    suffix = '.pt'
-    supported_meta_type = 'Page Template'
-
     def _exportBody(self):
         """Export the object as a file body.
         """
-        if self.context.meta_type == self.supported_meta_type:
-            return self.context.read()
-        return None
+        return self.context.read()
 
     def _importBody(self, body):
         """Import the object from the file body.
@@ -44,3 +38,7 @@
         self.context.write(body)
 
     body = property(_exportBody, _importBody)
+
+    mime_type = 'text/html'
+
+    suffix = '.pt'

Modified: GenericSetup/trunk/PageTemplates/interfaces.py
===================================================================
--- GenericSetup/trunk/PageTemplates/interfaces.py	2006-05-31 09:47:45 UTC (rev 68405)
+++ GenericSetup/trunk/PageTemplates/interfaces.py	2006-05-31 10:12:09 UTC (rev 68406)
@@ -18,7 +18,7 @@
 from zope.interface import Interface
 
 
-class IPageTemplate(Interface):
+class IZopePageTemplate(Interface):
 
     """Page Templates using TAL, TALES, and METAL.
     """

Modified: GenericSetup/trunk/PageTemplates/tests/test_exportimport.py
===================================================================
--- GenericSetup/trunk/PageTemplates/tests/test_exportimport.py	2006-05-31 09:47:45 UTC (rev 68405)
+++ GenericSetup/trunk/PageTemplates/tests/test_exportimport.py	2006-05-31 10:12:09 UTC (rev 68406)
@@ -30,33 +30,32 @@
 """
 
 
-class PageTemplateBodyAdapterTests(BodyAdapterTestCase):
+class ZopePageTemplateBodyAdapterTests(BodyAdapterTestCase):
 
     def _getTargetClass(self):
         from Products.GenericSetup.PageTemplates.exportimport \
-                import PageTemplateBodyAdapter
+                import ZopePageTemplateBodyAdapter
 
-        return PageTemplateBodyAdapter
+        return ZopePageTemplateBodyAdapter
 
     def _populate(self, obj):
         obj.write(_PAGETEMPLATE_BODY)
 
     def setUp(self):
         import Products.GenericSetup.PageTemplates
-        from Products.PageTemplates.PageTemplate import PageTemplate
+        from Products.PageTemplates.ZopePageTemplate import ZopePageTemplate
 
         BodyAdapterTestCase.setUp(self)
         zcml.load_config('configure.zcml',
                          Products.GenericSetup.PageTemplates)
 
-        self._obj = PageTemplate('foo_template')
-        self._obj.meta_type = 'Page Template'
+        self._obj = ZopePageTemplate('foo_template')
         self._BODY = _PAGETEMPLATE_BODY
 
 
 def test_suite():
     return unittest.TestSuite((
-        unittest.makeSuite(PageTemplateBodyAdapterTests),
+        unittest.makeSuite(ZopePageTemplateBodyAdapterTests),
         ))
 
 if __name__ == '__main__':