[Checkins] SVN: zope.app.onlinehelp/trunk/ Use ``zope.site`` instead of ``zope.app.folder``.

[Michael Howitz]

Log message for revision 98297:
  Use ``zope.site`` instead of ``zope.app.folder``.
  
  

Changed:
  U   zope.app.onlinehelp/trunk/CHANGES.txt
  U   zope.app.onlinehelp/trunk/setup.py
  U   zope.app.onlinehelp/trunk/src/zope/app/onlinehelp/browser/tests.py

-=-
Modified: zope.app.onlinehelp/trunk/CHANGES.txt
===================================================================
--- zope.app.onlinehelp/trunk/CHANGES.txt	2009-03-21 00:46:52 UTC (rev 98296)
+++ zope.app.onlinehelp/trunk/CHANGES.txt	2009-03-21 07:46:46 UTC (rev 98297)
@@ -5,7 +5,7 @@
 3.5.1 (unreleased)
 ------------------
 
-- ...
+- Use ``zope.site`` instead of ``zope.app.folder``.
 
 3.5.0 (2009-02-01)
 ------------------

Modified: zope.app.onlinehelp/trunk/setup.py
===================================================================
--- zope.app.onlinehelp/trunk/setup.py	2009-03-21 00:46:52 UTC (rev 98296)
+++ zope.app.onlinehelp/trunk/setup.py	2009-03-21 07:46:46 UTC (rev 98297)
@@ -51,7 +51,6 @@
                           'ZODB3',
                           'zope.app.component',
                           'zope.app.file',
-                          'zope.app.folder',
                           'zope.app.pagetemplate',
                           'zope.app.publication',
                           'zope.app.security',
@@ -72,6 +71,7 @@
       extras_require = dict(test=['zope.app.testing',
                                   'zope.app.preference',
                                   'zope.app.apidoc',
+                                  'zope.site',
                                   'zope.app.securitypolicy',
                                   'zope.app.zcmlfiles',
                                   'zope.securitypolicy']),

Modified: zope.app.onlinehelp/trunk/src/zope/app/onlinehelp/browser/tests.py
===================================================================
--- zope.app.onlinehelp/trunk/src/zope/app/onlinehelp/browser/tests.py	2009-03-21 00:46:52 UTC (rev 98296)
+++ zope.app.onlinehelp/trunk/src/zope/app/onlinehelp/browser/tests.py	2009-03-21 07:46:46 UTC (rev 98297)
@@ -19,7 +19,7 @@
 import transaction
 import unittest
 
-from zope.app.folder.interfaces import IRootFolder
+from zope.site.interfaces import IRootFolder
 from zope.app.file import File
 from zope.app.testing.functional import BrowserTestCase
 from zope.app.onlinehelp.tests.test_onlinehelp import testdir
@@ -37,8 +37,8 @@
 
         transaction.commit()
 
-        response = self.publish("/+/action.html", basic='mgr:mgrpw', 
-                                form={'type_name':u'zope.app.content.File', 
+        response = self.publish("/+/action.html", basic='mgr:mgrpw',
+                                form={'type_name':u'zope.app.content.File',
                                       'id':u'file'})
 
         self.assertEqual(response.getStatus(), 302)
@@ -57,7 +57,7 @@
         body = ' '.join(response.getBody().split())
         self.assert_(body.find("This is another help!") >= 0)
 
-        response = self.publish('/index.html/++help++/@@contexthelp.html', 
+        response = self.publish('/index.html/++help++/@@contexthelp.html',
                                 basic='mgr:mgrpw')
 
         self.assertEqual(response.getStatus(), 200)