[Checkins] SVN: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/ For a while now, ftests have been based on a standard DocTestSuite, which means

Philipp von Weitershausen philikon at philikon.de
Sat Aug 25 07:41:04 EDT 2007


Log message for revision 79251:
  For a while now, ftests have been based on a standard DocTestSuite, which means
  that the docstrings do have access to the global module namespace.  We no longer
  need to explicitly import the stuff.
  
  Removed grok/ftests/README.txt which indicated that import problem.
  
  Removed no longer needed imports.
  

Changed:
  D   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/README.txt
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/catalog.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_app_interface.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_attribute.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_class.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_multiple.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_multiple_conflict.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_name.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_nonexistent.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_set.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_site.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/setuporder.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/actions.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform_applydata.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform_catalog.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata_classfields.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata_schema.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/form.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/templateform.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/update.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/containertraverse.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/containertraverser.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/items_before_views.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/modeltraverse.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/traverser.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/traverser_sets_parent.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/application.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/redirect.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/url.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/url_function.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/local.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/local_override.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/public.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/subclass.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/argument.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/index.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/macros.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/view.py
  U   grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc/xmlrpc.py

-=-
Deleted: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/README.txt
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/README.txt	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/README.txt	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,6 +0,0 @@
-Creating functional tests
--------------------------
-
-Unfortunately, functional doctests do not import themselves (as the
-unit-test ones do), so you need to manually import the module in the
-doctest part.

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/catalog.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/catalog.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/catalog.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,6 +1,4 @@
 """
-  >>> from grok.ftests.catalog.catalog import Mammoth, Herd
-
 Let's setup a site in which we manage a couple of objects:
 
   >>> herd = Herd()

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -4,7 +4,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes import Herd, Herd2, Mammoth
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> from zope.app.component.hooks import setSite

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_app_interface.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_app_interface.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_app_interface.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -5,7 +5,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_app_interface import Herd, Herd2, Mammoth
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> from zope.app.component.hooks import setSite

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_attribute.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_attribute.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_attribute.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -6,7 +6,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_attribute import Herd, Mammoth
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> from zope.app.component.hooks import setSite

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_class.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_class.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_class.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -5,7 +5,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_class import Herd, Mammoth
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> from zope.app.component.hooks import setSite

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_multiple.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_multiple.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_multiple.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -5,7 +5,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_multiple import Herd
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> from zope.app.component.hooks import setSite

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_multiple_conflict.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_multiple_conflict.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_multiple_conflict.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -6,7 +6,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_multiple_conflict import Herd
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   Traceback (most recent call last):

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_name.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_name.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_name.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -5,7 +5,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_name import Herd, Mammoth
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> from zope.app.component.hooks import setSite

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_nonexistent.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_nonexistent.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_nonexistent.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -5,7 +5,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_nonexistent import Herd
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   Traceback (most recent call last):

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_set.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_set.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_set.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -3,7 +3,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_set import Herd, Mammoth
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> from zope.app.component.hooks import setSite

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_site.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_site.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/indexes_site.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -5,7 +5,6 @@
 
 Let's set up a site in which we manage a couple of objects::
 
-  >>> from grok.ftests.catalog.indexes_site import Herd
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> from zope.app.component.hooks import setSite

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/setuporder.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/setuporder.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/catalog/setuporder.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,8 +2,6 @@
 This is similar to catalog.py, except that the site uses a base class
 which also defines a local utility.
 
-  >>> from grok.ftests.catalog.setuporder import Mammoth, Herd
-
 Let's setup a site in which we manage a couple of objects:
 
   >>> herd = Herd()

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/actions.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/actions.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/actions.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -4,7 +4,6 @@
 'Apply' action) is not available anymore, but it can triggered
 manually by calling self.applyData(object, data).
 
-  >>> from grok.ftests.form.actions import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,7 +1,6 @@
 """
 We can use grok.AddForm to render an add form for objects:
 
-  >>> from grok.ftests.form.addform import Zoo, Mammoth
   >>> getRootFolder()["zoo"] = Zoo()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform_applydata.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform_applydata.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform_applydata.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -3,7 +3,6 @@
 object.  The object doesn't yet need to have the attributes that are
 going to be set on it.
 
-  >>> from grok.ftests.form.addform_applydata import Zoo, Mammoth
   >>> getRootFolder()["zoo"] = Zoo()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform_catalog.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform_catalog.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/addform_catalog.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,7 +2,6 @@
 Thanks to Zope's event system, newly added objects are automatically
 catalogued, should a catalog be present.
 
-  >>> from grok.ftests.form.addform_catalog import Zoo, Mammoth
   >>> getRootFolder()["zoo"] = Zoo()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -3,7 +3,6 @@
 the object.  Update mode means that only those fields are changed on
 the object that need to be changed.
 
-  >>> from grok.ftests.form.editform_applydata import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth('Manfred the Mammoth', 'Really big')
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata_classfields.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata_classfields.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata_classfields.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -6,7 +6,6 @@
 This is essentially the same narrative as 'editform_applydata'. Here
 we test the whole procedure on fields defined on the model class:
 
-  >>> from grok.ftests.form.editform_applydata_classfields import Mammoth
   >>> getRootFolder()["manfred"] = mammoth = Mammoth()
   >>> mammoth.name = 'Manfred the Mammoth'
   >>> mammoth.size = 'Really big'

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata_schema.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata_schema.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/editform_applydata_schema.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -6,7 +6,6 @@
 This is essentially the same narrative as 'editform_applydata'. Here
 we test the whole procedure on fields from schemas:
 
-  >>> from grok.ftests.form.editform_applydata_schema import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth('Manfred the Mammoth', 'Really big')
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/form.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/form.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/form.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,7 +1,6 @@
 """
 A grok.EditForm is a special grok.View that renders an edit form.
 
-  >>> from grok.ftests.form.form import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/templateform.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/templateform.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/templateform.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,8 +2,6 @@
 If a form does not have a template, a simple default template is
 associated with them. Otherwise, the supplied template is used.
 
-  >>> from grok.ftests.form.templateform import Mammoth
-
   >>> from zope.publisher.browser import TestRequest
   >>> request = TestRequest()
   >>> from zope import component

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/update.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/update.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/form/update.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,7 +2,6 @@
 Forms can implement an update() method that will be called before any
 form processing has happened:
 
-  >>> from grok.ftests.form.update import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/containertraverse.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/containertraverse.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/containertraverse.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -3,7 +3,6 @@
 implementing a 'traverse' method, but the behavior falls back to
 basic container traversal if the 'traverse' method returns None:
 
-  >>> from grok.ftests.traversal.containertraverse import Herd, Mammoth
   >>> getRootFolder()["herd"] = herd = Herd()
   >>> herd['manfred'] = Mammoth('Manfred')
   >>> herd['ellie'] = Mammoth('Ellie')

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/containertraverser.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/containertraverser.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/containertraverser.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -3,7 +3,6 @@
 The behavior falls back to basic container traversal if the 'traverse'
 method returns None:
 
-  >>> from grok.ftests.traversal.containertraverser import Herd, Mammoth
   >>> getRootFolder()["herd"] = herd = Herd()
   >>> herd['manfred'] = Mammoth('Manfred')
   >>> herd['ellie'] = Mammoth('Ellie')

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/items_before_views.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/items_before_views.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/items_before_views.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -4,7 +4,6 @@
 method returns None. Normal behaviour also means that the standard
 Zope 3 paradigm"items before views" is supported in the fallback.
 
-  >>> from grok.ftests.traversal.items_before_views import Herd, Mammoth
   >>> getRootFolder()["herd"] = herd = Herd()
   >>> herd['manfred'] = Mammoth('Manfred')
   >>> herd['ellie'] = Mammoth('Ellie')

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/modeltraverse.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/modeltraverse.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/modeltraverse.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,7 +2,6 @@
 Models can determine how they want to be traversed by
 implementing a 'traverse' method:
 
-  >>> from grok.ftests.traversal.modeltraverse import Herd
   >>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/traverser.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/traverser.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/traverser.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,7 +2,6 @@
 Apart from using the ``traverse`` method on a model, you can
 also create a separate traverser component:
 
-  >>> from grok.ftests.traversal.traverser import Herd
   >>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/traverser_sets_parent.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/traverser_sets_parent.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/traversal/traverser_sets_parent.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,7 +2,6 @@
 A traverser can set the __parent__ (and __name__) attributes itself,
 in which case Grok's traverser won't interfere:
 
-  >>> from grok.ftests.traversal.traverser_sets_parent import Herd
   >>> getRootFolder()["herd"] = Herd('The Big Mammoth Herd')
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/application.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/application.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/application.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,7 +2,6 @@
 Views have an application_url() method to easily retrieve the url of the
 application::
 
-  >>> from grok.ftests.url.application import Cave, CaveMan
   >>> getRootFolder()['cave'] = cave = Cave()
   >>> cave['caveman'] = CaveMan()
 

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/redirect.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/redirect.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/redirect.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,7 +1,6 @@
 """
 Views have a redirect() method to easily create redirects:
 
-  >>> from grok.ftests.url.redirect import Mammoth
   >>> getRootFolder()['manfred'] = manfred = Mammoth()
 
 Since the index view redirects to mammoth, we expect to see the URL

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/url.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/url.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/url.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,7 +2,6 @@
 """
 Views have a method that can be used to construct URLs:
 
-  >>> from grok.ftests.url.url import Herd, Mammoth
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> manfred = Mammoth()

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/url_function.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/url_function.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/url/url_function.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -5,7 +5,6 @@
 
   >>> from grok import url
   
-  >>> from grok.ftests.url.url_function import Herd, Mammoth
   >>> herd = Herd()
   >>> getRootFolder()['herd'] = herd
   >>> manfred = Mammoth()

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/local.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/local.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/local.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,12 +2,10 @@
 Local Utilities can be registered on subclasses of grok.Site using
 grok.local_utility:
 
-  >>> from zope import component
-  >>> from grok.ftests.utility.local import *
-
   >>> cave = Cave()
   >>> getRootFolder()["cave"] = cave
 
+  >>> from zope import component
   >>> from zope.app.component.hooks import getSite, setSite
   >>> setSite(cave)
   

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/local_override.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/local_override.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/local_override.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -2,12 +2,10 @@
 Local Utilities can be registered on subclasses of grok.Site using
 grok.local_utility:
 
-  >>> from zope import component
-  >>> from grok.ftests.utility.local_override import *
-
   >>> cave = SpikyCave()
   >>> getRootFolder()['cave'] = cave
 
+  >>> from zope import component
   >>> from zope.app.component.hooks import getSite, setSite
   >>> setSite(cave)
 

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/public.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/public.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/public.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -4,12 +4,10 @@
 that is the site. The name the utility should have in the container can
 be controlled using name_in_container:
 
-  >>> from zope import component
-  >>> from grok.ftests.utility.public import *
-
   >>> cave = Cave()
   >>> getRootFolder()["cave"] = cave
 
+  >>> from zope import component
   >>> from zope.app.component.hooks import getSite, setSite
   >>> setSite(cave)
   >>> cave['fireplace'] is component.getUtility(IFireplace)

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/subclass.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/subclass.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/utility/subclass.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,12 +1,10 @@
 """
 Subclassed sites inherit all local utilities of their base classes:
 
-  >>> from zope import component
-  >>> from grok.ftests.utility.subclass import *
-
   >>> cave = BigCave()
   >>> getRootFolder()["cave"] = cave
 
+  >>> from zope import component
   >>> from zope.app.component.hooks import getSite, setSite
 
   >>> setSite(cave)

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/argument.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/argument.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/argument.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,5 +1,4 @@
 """
-  >>> from grok.ftests.view.argument import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/index.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/index.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/index.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,5 +1,4 @@
 """
-  >>> from grok.ftests.view.index import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth()
 
 The default view name for a model is 'index':

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/macros.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/macros.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/macros.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,5 +1,4 @@
 """
-  >>> from grok.ftests.view.macros import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/view.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/view.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/view/view.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,5 +1,4 @@
 """
-  >>> from grok.ftests.view.view import Mammoth
   >>> getRootFolder()["manfred"] = Mammoth()
 
   >>> from zope.testbrowser.testing import Browser

Modified: grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc/xmlrpc.py
===================================================================
--- grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc/xmlrpc.py	2007-08-25 11:36:33 UTC (rev 79250)
+++ grok/branches/philikon-ftest-layer-does-fixture-setup/src/grok/ftests/xmlrpc/xmlrpc.py	2007-08-25 11:41:03 UTC (rev 79251)
@@ -1,5 +1,4 @@
 """
-  >>> from grok.ftests.xmlrpc.xmlrpc import Mammoth
   >>> getRootFolder()["Manfred"] = Mammoth()
 
   >>> from zope.app.testing.xmlrpc import ServerProxy



More information about the Checkins mailing list