[Checkins] SVN: z3c.form/trunk/src/z3c/form/testing.py further test setup reduction and cleanup

[Hano Schlichting]

Log message for revision 126440:
  further test setup reduction and cleanup
  

Changed:
  U   z3c.form/trunk/src/z3c/form/testing.py

-=-
Modified: z3c.form/trunk/src/z3c/form/testing.py
===================================================================
--- z3c.form/trunk/src/z3c/form/testing.py	2012-05-22 17:44:00 UTC (rev 126439)
+++ z3c.form/trunk/src/z3c/form/testing.py	2012-05-22 18:09:26 UTC (rev 126440)
@@ -38,6 +38,7 @@
 # register lxml doctest option flags
 lxml.doctestcompare.NOPARSE_MARKUP = register_optionflag('NOPARSE_MARKUP')
 
+
 class TestingFileUploadDataConverter(converter.FileUploadDataConverter):
     """A special file upload data converter that works with testing."""
     zope.component.adapts(
@@ -45,20 +46,22 @@
 
     def toFieldValue(self, value):
         if value is None or value == '':
-            value = self.widget.request.get(self.widget.name+'.testing', '')
+            value = self.widget.request.get(self.widget.name + '.testing', '')
             encoding = self.widget.request.get(
-                self.widget.name+'.encoding', 'plain')
+                self.widget.name + '.encoding', 'plain')
 
             # allow for the case where the file contents are base64 encoded.
-            if encoding!='plain':
+            if encoding != 'plain':
                 value = value.decode(encoding)
             self.widget.request.form[self.widget.name] = value
 
         return super(TestingFileUploadDataConverter, self).toFieldValue(value)
 
+
 class TestRequest(TestRequest):
     zope.interface.implements(interfaces.IFormLayer)
 
+
 class SimpleSecurityPolicy(object):
     """Allow all access."""
     zope.interface.implements(IInteraction)
@@ -81,6 +84,7 @@
                 return True
         return False
 
+
 def getPath(filename):
     return os.path.join(os.path.dirname(browser.__file__), filename)
 
@@ -100,18 +104,21 @@
         default=2222,
         required=False)
 
+
 class MySubObject(object):
     zope.interface.implements(IMySubObject)
 
     foofield = FieldProperty(IMySubObject['foofield'])
     barfield = FieldProperty(IMySubObject['barfield'])
 
+
 class IMySecond(zope.interface.Interface):
     subfield = zope.schema.Object(
         title=u"Second-subobject",
         schema=IMySubObject)
     moofield = zope.schema.TextLine(title=u"Something")
 
+
 class MySecond(object):
     zope.interface.implements(IMySecond)
 
@@ -123,11 +130,13 @@
     subobject = zope.schema.Object(title=u'my object', schema=IMySubObject)
     name = zope.schema.TextLine(title=u'name')
 
+
 class MyObject(object):
     zope.interface.implements(IMyObject)
+
     def __init__(self, name=u'', subobject=None):
-        self.subobject=subobject
-        self.name=name
+        self.subobject = subobject
+        self.name = name
 
 
 class IMyComplexObject(zope.interface.Interface):
@@ -138,7 +147,7 @@
 class IMySubObjectMulti(zope.interface.Interface):
     foofield = zope.schema.Int(
         title=u"My foo field",
-        default=None, #default is None here!
+        default=None,  # default is None here!
         max=9999,
         required=True)
     barfield = zope.schema.Int(
@@ -146,21 +155,24 @@
         default=2222,
         required=False)
 
+
 class MySubObjectMulti(object):
     zope.interface.implements(IMySubObjectMulti)
 
     foofield = FieldProperty(IMySubObjectMulti['foofield'])
     barfield = FieldProperty(IMySubObjectMulti['barfield'])
 
+
 class IMyMultiObject(zope.interface.Interface):
     listOfObject = zope.schema.List(
-        title = u"My list field",
-        value_type = zope.schema.Object(
+        title=u"My list field",
+        value_type=zope.schema.Object(
             title=u'my object widget',
             schema=IMySubObjectMulti),
     )
     name = zope.schema.TextLine(title=u'name')
 
+
 class MyMultiObject(object):
     zope.interface.implements(IMyMultiObject)
 
@@ -173,34 +185,19 @@
 
 
 def setUp(test):
-    from zope.component.testing import setUp as co_setup
-    from zope.component.eventtesting import setUp as ev_setup
-    from zope.i18n.testing import setUp as i18n_setup
-    from zope.container.testing import setUp as con_setup
-
-    co_setup()
-    ev_setup()
-    con_setup()
-    i18n_setup()
-
-    from zope.security.testing import addCheckerPublic
-    addCheckerPublic()
-
-    from zope.security.management import newInteraction
-    newInteraction()
-
+    from zope.component.testing import setUp
+    setUp()
+    from zope.container.testing import setUp
+    setUp()
     from zope.component import hooks
     hooks.setHooks()
-
     from zope.traversing.testing import setUp
     setUp()
-
     from zope.site.folder import rootFolder
     site = rootFolder()
-
     from zope.site.site import LocalSiteManager
-    import zope.component.interfaces
-    if not zope.component.interfaces.ISite.providedBy(site):
+    from zope.component.interfaces import ISite
+    if not ISite.providedBy(site):
         site.setSiteManager(LocalSiteManager(site))
     hooks.setSite(site)
     test.globs = {'root': site}
@@ -209,6 +206,7 @@
 def setUpZPT(suite):
     setUp(suite)
 
+
 def setUpZ3CPT(suite):
     import z3c.pt
     import z3c.ptcompat
@@ -216,6 +214,7 @@
     zope.configuration.xmlconfig.XMLConfig('configure.zcml', z3c.pt)()
     zope.configuration.xmlconfig.XMLConfig('configure.zcml', z3c.ptcompat)()
 
+
 def setupFormDefaults():
     # Validator adapters
     zope.component.provideAdapter(validator.SimpleFieldValidator)