[Checkins] SVN: zope.site/trunk/src/zope/site/ import Folder from the new location and change the classname comparissions in the doctests

[Jan-Wijbrand Kolman]

Log message for revision 95569:
  import Folder from the new location and change the classname comparissions in the doctests

Changed:
  U   zope.site/trunk/src/zope/site/README.txt
  U   zope.site/trunk/src/zope/site/site.txt
  U   zope.site/trunk/src/zope/site/tests/folder.txt
  U   zope.site/trunk/src/zope/site/tests/test_localsitemanager.py
  U   zope.site/trunk/src/zope/site/tests/test_site.py

-=-
Modified: zope.site/trunk/src/zope/site/README.txt
===================================================================
--- zope.site/trunk/src/zope/site/README.txt	2009-01-30 14:50:35 UTC (rev 95568)
+++ zope.site/trunk/src/zope/site/README.txt	2009-01-30 14:58:28 UTC (rev 95569)
@@ -37,7 +37,7 @@
 
 We create a simple folder hierarchy we can place our utilities in:
 
-  >>> from zope.app.folder import Folder, rootFolder
+  >>> from zope.site.folder import Folder, rootFolder
   >>> root = rootFolder()
   >>> root[u'folder1'] = Folder()
   >>> root[u'folder1'][u'folder1_1'] = Folder()

Modified: zope.site/trunk/src/zope/site/site.txt
===================================================================
--- zope.site/trunk/src/zope/site/site.txt	2009-01-30 14:50:35 UTC (rev 95568)
+++ zope.site/trunk/src/zope/site/site.txt	2009-01-30 14:58:28 UTC (rev 95569)
@@ -10,7 +10,7 @@
 *Sites* are used to provide custom component setups for parts of your
 application or web site. Every folder:
 
-  >>> from zope.app.folder import folder
+  >>> from zope.site import folder
   >>> myfolder = folder.rootFolder()
 
 has the potential to become a site:

Modified: zope.site/trunk/src/zope/site/tests/folder.txt
===================================================================
--- zope.site/trunk/src/zope/site/tests/folder.txt	2009-01-30 14:50:35 UTC (rev 95568)
+++ zope.site/trunk/src/zope/site/tests/folder.txt	2009-01-30 14:58:28 UTC (rev 95569)
@@ -34,7 +34,7 @@
 
 Let's add another folder to see how a non-site folder behaves:
 
-  >>> from zope.app.folder.folder import Folder
+  >>> from zope.site.folder import Folder
   >>> folder['test'] = Folder()
 
 The site folder now contains the new folder:
@@ -42,17 +42,17 @@
   >>> fs_folder.keys()
   [u'test', '++etc++site']
   >>> fs_folder.get('test')
-  <zope.app.folder.folder.Folder object at 0x...>
+  <zope.site.folder.Folder object at 0x...>
   >>> fs_folder['test']
-  <zope.app.folder.folder.Folder object at 0x...>
+  <zope.site.folder.Folder object at 0x...>
   >>> list(fs_folder.__iter__())
   [u'test', '++etc++site']
   >>> fs_folder.values()
-  [<zope.app.folder.folder.Folder object at 0x...>, <LocalSiteManager ++etc++site>]
+  [<zope.site.folder.Folder object at 0x...>, <LocalSiteManager ++etc++site>]
   >>> len(fs_folder)
   2
   >>> fs_folder.items()
-  [(u'test', <zope.app.folder.folder.Folder object at 0x...>),
+  [(u'test', <zope.site.folder.Folder object at 0x...>),
    ('++etc++site', <LocalSiteManager ++etc++site>)]
   >>> 'test' in fs_folder
   True

Modified: zope.site/trunk/src/zope/site/tests/test_localsitemanager.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_localsitemanager.py	2009-01-30 14:50:35 UTC (rev 95568)
+++ zope.site/trunk/src/zope/site/tests/test_localsitemanager.py	2009-01-30 14:58:28 UTC (rev 95569)
@@ -20,7 +20,7 @@
 from zope.interface import Interface
 from zope.copypastemove import ObjectCopier
 from zope import site
-from zope.app.folder import Folder
+from zope.site.folder import Folder
 from zope.app.testing.placelesssetup import PlacelessSetup
 
 class I1(Interface):

Modified: zope.site/trunk/src/zope/site/tests/test_site.py
===================================================================
--- zope.site/trunk/src/zope/site/tests/test_site.py	2009-01-30 14:50:35 UTC (rev 95568)
+++ zope.site/trunk/src/zope/site/tests/test_site.py	2009-01-30 14:58:28 UTC (rev 95569)
@@ -23,7 +23,7 @@
 from zope.testing import doctest
 from zope.location.interfaces import ISite, IPossibleSite
 
-from zope.app.folder import folder
+from zope.site import folder
 
 from zope.site import interfaces
 from zope import site