[Checkins] SVN: zope.component/trunk/src/zope/component/ Make tests for ``with site()`` run under Python-2.5

[Wolfgang Schnerring]

Log message for revision 123378:
  Make tests for ``with site()`` run under Python-2.5
  

Changed:
  U   zope.component/trunk/src/zope/component/hooks.txt
  U   zope.component/trunk/src/zope/component/tests.py

-=-
Modified: zope.component/trunk/src/zope/component/hooks.txt
===================================================================
--- zope.component/trunk/src/zope/component/hooks.txt	2011-11-16 11:41:36 UTC (rev 123377)
+++ zope.component/trunk/src/zope/component/hooks.txt	2011-11-16 11:55:01 UTC (rev 123378)
@@ -72,6 +72,7 @@
 useful when writing tests:
 
 >>> import zope.component.hooks
+>>> dummy = with_statement # support for Python-2.5
 >>> print getSite()
 None
 >>> with zope.component.hooks.site(site2):

Modified: zope.component/trunk/src/zope/component/tests.py
===================================================================
--- zope.component/trunk/src/zope/component/tests.py	2011-11-16 11:41:36 UTC (rev 123377)
+++ zope.component/trunk/src/zope/component/tests.py	2011-11-16 11:55:01 UTC (rev 123378)
@@ -1707,7 +1707,9 @@
     zcml_conditional = doctest.DocFileSuite('zcml_conditional.txt', checker=checker)
     zcml_conditional.layer = ConditionalSecurityLayer()
 
-    hooks_conditional = doctest.DocFileSuite('hooks.txt', checker=checker)
+    with_globs = dict(with_statement=__future__.with_statement)
+    hooks_conditional = doctest.DocFileSuite(
+        'hooks.txt', checker=checker, globs=with_globs)
     hooks_conditional.layer = ConditionalSecurityLayer()
 
     return unittest.TestSuite((
@@ -1724,8 +1726,7 @@
                              setUp=setUp, tearDown=tearDown),
         doctest.DocFileSuite('hooks.txt', checker=checker,
                              setUp=setUp, tearDown=tearDown,
-                             globs=dict(
-                    with_statement=__future__.with_statement)),
+                             globs=with_globs),
         doctest.DocFileSuite('event.txt',
                              setUp=setUp, tearDown=tearDown),
         doctest.DocTestSuite('zope.component.security'),