[z3-checkins] r27274 - in z3/xicken/trunk: . src/xicken

[tseaver at codespeak.net]

Author: tseaver
Date: Tue May 16 14:38:54 2006
New Revision: 27274

Modified:
   z3/xicken/trunk/CHANGES.txt
   z3/xicken/trunk/src/xicken/browser.py
   z3/xicken/trunk/src/xicken/interfaces.py
Log:
Update for compatibility with Zope 3.2+.

Fixed bug blocking page removal.



Modified: z3/xicken/trunk/CHANGES.txt
==============================================================================
--- z3/xicken/trunk/CHANGES.txt	(original)
+++ z3/xicken/trunk/CHANGES.txt	Tue May 16 14:38:54 2006
@@ -1,7 +1,12 @@
-Xickens Package Changelog
-=========================
+Xicken Package Changelog
+========================
 
-After xickens-0.1.1
+xicken-0.2 (2006/05/16)
+----------------------
+
+  - Update for compatibility with Zope 3.2+.
+
+  - Fixed bug blocking page removal.
 
   - Derive from IContained, rathar than ILocation, to get our __parent__
     set majykally.
@@ -15,10 +20,12 @@
   - Add "index.xml" views for fetching simple XML serialization of a
     XickenPage or a XickenSite.
 
-xickens-0.1.1 (2004/10/19)
+xicken-0.1.1 (2004/10/19)
+-------------------------
 
   - Allow Mom to edit site title.
 
-xickens-0.1.0 (2004/09/27)
+xicken-0.1.0 (2004/09/27)
+-------------------------
 
   - Simplest-possible Zope3 content management application (not a framework!)

Modified: z3/xicken/trunk/src/xicken/browser.py
==============================================================================
--- z3/xicken/trunk/src/xicken/browser.py	(original)
+++ z3/xicken/trunk/src/xicken/browser.py	Tue May 16 14:38:54 2006
@@ -2,11 +2,10 @@
 
 $Id$
 """
-from transaction import get_transaction
+import transaction
 
 from zope.event import notify
-from zope.i18nmessageid import MessageIDFactory
-from zope.app import zapi
+from zope.component import getMultiAdapter
 from zope.app.event.objectevent import ObjectCreatedEvent
 from zope.app.event.objectevent import ObjectModifiedEvent
 
@@ -14,7 +13,11 @@
 from xicken.interfaces import IXickenPage
 from xicken.content import XickenPage
 
-_ = MessageIDFactory('xicken')
+try:
+    from zope.i18nmessageid import MessageFactory
+except ImportError:
+    from zope.i18nmessageid import MessageIDFactory as MessageFactory
+_ = MessageFactory('xicken')
 
 class XickenBaseView:
 
@@ -37,7 +40,8 @@
 
     def _getURL(self, page):
 
-        return zapi.getView(page, 'absolute_url', self.request)
+        view = getMultiAdapter((page, self.request), name='absolute_url')
+        return view()
 
     def _getContextUrl(self):
 
@@ -73,7 +77,7 @@
 
             if self.errors:
                 status = _("Could not save configuration.")
-                get_transaction().abort()
+                transaction.get().abort()
             else:
                 self.context.title = title
                 notify(ObjectModifiedEvent(self.context))
@@ -106,7 +110,7 @@
 
             if self.errors:
                 status = _("Could not add page.")
-                get_transaction().abort()
+                transaction.get().abort()
             else:
                 page = XickenPage(name)
                 page.title = title
@@ -134,10 +138,10 @@
 
         if error:
             self.request.response.redirect('%s/FrontPage?error=%s'
-                                            % (self.site_url(), error))
+                                            % (self.site_url, error))
         else:
             self.request.response.redirect('%s/FrontPage?message=%s'
-                                            % (self.site_url(), message))
+                                            % (self.site_url, message))
         return error or message
 
 class XickenPageView(XickenBaseView):
@@ -176,7 +180,7 @@
 
             if self.errors:
                 status = _("Could not save page.")
-                get_transaction().abort()
+                transaction.get().abort()
             else:
                 self.savePage(title, body)
                 notify(ObjectModifiedEvent(self.context))

Modified: z3/xicken/trunk/src/xicken/interfaces.py
==============================================================================
--- z3/xicken/trunk/src/xicken/interfaces.py	(original)
+++ z3/xicken/trunk/src/xicken/interfaces.py	Tue May 16 14:38:54 2006
@@ -5,12 +5,15 @@
 
 from zope.schema import Text
 from zope.schema import TextLine
-from zope.i18nmessageid import MessageIDFactory
 
 from zope.app.folder.interfaces import IFolder
 from zope.app.file.interfaces import IFile
 
-_ = MessageIDFactory('xicken')
+try:
+    from zope.i18nmessageid import MessageFactory
+except ImportError:
+    from zope.i18nmessageid import MessageIDFactory as MessageFactory
+_ = MessageFactory('xicken')
 
 class IXickenSite(IFolder):
     """A Xicken Site is a simple CM appliction for creating pages.