Index: /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py
===================================================================
--- /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 6192)
+++ /main/waeup.sirp/trunk/src/waeup/sirp/browser/layout.py	(revision 6193)
@@ -8,11 +8,7 @@
 from z3c.flashmessage.interfaces import IMessageSource, IMessageReceiver
 from zope.component import getUtility, queryUtility, ComponentLookupError
+from zope.formlib.utility import setUpWidgets
 from zope.interface import Interface
-try:
-    from zope.site.hooks import getSite
-except ImportError:
-    # BBB
-    from zope.app.component.hooks import getSite
-from zope.formlib.utility import setUpWidgets    
+from zope.site.hooks import getSite
 from waeup.sirp.interfaces import IWAeUPObject
 from waeup.sirp.browser.interfaces import ITheme
@@ -62,5 +58,5 @@
     title = u'' # What appears in the content title...
     pnav = 0 # Primary navigation index...
-    
+
     def application_url(self, name=None):
         """Return the URL of the nearest site.
@@ -84,5 +80,5 @@
     """
     grok.baseclass()
-    
+
 class WAeUPPage(Page):
     """A megrok.layout page with additional methods.
@@ -101,5 +97,5 @@
     grok.baseclass()
     template = default_waeup_edit_template
-    
+
     def setUpWidgets(self,ignore_request=False):
         super(WAeUPEditFormPage,self).setUpWidgets(ignore_request)
@@ -126,8 +122,8 @@
     def site(self):
         return grok.getSite()
-    
+
     def getAppTitle(self):
         return getattr(grok.getSite(), 'name', u'Sample University')
-        
+
     def isAuthenticated(self):
         """Return True if the calling user is authenticated.
@@ -135,5 +131,5 @@
         usertitle = self.request.principal.title
         return usertitle != 'Unauthenticated User'
-    
+
     def getUserTitle(self):
         """Return principal title of current user.
@@ -171,2 +167,3 @@
             resource.need()
         return
+
