[z3-checkins] r28630 - z3/Sfive/trunk

[philikon at codespeak.net]

Author: philikon
Date: Sat Jun 10 17:21:35 2006
New Revision: 28630

Modified:
   z3/Sfive/trunk/browser.py
   z3/Sfive/trunk/presentation.py
Log:
Make this package work in Zope 3 and Zope 2 alike.


Modified: z3/Sfive/trunk/browser.py
==============================================================================
--- z3/Sfive/trunk/browser.py	(original)
+++ z3/Sfive/trunk/browser.py	Sat Jun 10 17:21:35 2006
@@ -6,10 +6,15 @@
 import zope.component
 from zope.traversing.browser import absoluteURL
 from zope.publisher.browser import BrowserPage
-from zope.formlib.form import AddForm, EditForm, Fields, applyChanges
+from zope.formlib.form import Fields, applyChanges
 from zope.i18nmessageid import MessageFactory
 _ = MessageFactory('sfive')
 
+try:
+    from Products.Five.formlib.formbase import AddForm, EditForm
+except ImportError:
+    from zope.formlib import AddForm, EditForm
+
 from Products.Sfive.interfaces import IPresentation
 
 class ViewPresentation(BrowserPage):

Modified: z3/Sfive/trunk/presentation.py
==============================================================================
--- z3/Sfive/trunk/presentation.py	(original)
+++ z3/Sfive/trunk/presentation.py	Sat Jun 10 17:21:35 2006
@@ -5,7 +5,11 @@
 from zope.i18nmessageid import MessageFactory
 _ = MessageFactory('sfive')
 
-from OFS.SimpleItem import SimpleItem
+try:
+    from OFS.SimpleItem import SimpleItem
+except ImportError:
+    from persistent import Persistent as SimpleItem
+
 from Products.Sfive.interfaces import IPresentation
 
 class Presentation(SimpleItem):