Log message for revision 71762:
  merged fixes from HEAD in order to make "zopectl test"
  properly with the UnicodeEncodingConflictResolver configured through ZCML
  

Changed:
  U   
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/output/CheckI18nTranslateHooked.html
  U   
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/testDTMLTests.py
  U   
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/testHTMLTests.py
  U   Zope/branches/2.10/lib/python/Products/PageTemplates/tests/test_ptfile.py

-=-
Modified: 
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/output/CheckI18nTranslateHooked.html
===================================================================
--- 
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/output/CheckI18nTranslateHooked.html
     2007-01-07 12:07:57 UTC (rev 71761)
+++ 
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/output/CheckI18nTranslateHooked.html
     2007-01-07 12:14:31 UTC (rev 71762)
@@ -3,7 +3,7 @@
 <head>
    <p>[foo](bar/{})</p>
    <a href="foo" alt="[default](alttext/{})">link</a>
-   <p>[dom](${name} was born in 
${country}./{'country':'Antarctica','name':'Lomax'})</p>
+   <p>[dom](${name} was born in 
${country}./{'country':u'Antarctica','name':u'Lomax'})</p>
    <p>[default](hmm/{'age':u'25'})</p>
 </head>
 </body>

Modified: 
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/testDTMLTests.py
===================================================================
--- Zope/branches/2.10/lib/python/Products/PageTemplates/tests/testDTMLTests.py 
2007-01-07 12:07:57 UTC (rev 71761)
+++ Zope/branches/2.10/lib/python/Products/PageTemplates/tests/testDTMLTests.py 
2007-01-07 12:14:31 UTC (rev 71762)
@@ -14,9 +14,12 @@
 import unittest
 
 import zope.component.testing
+from zope.component import provideUtility
 from zope.traversing.adapters import DefaultTraversable
 from Products.PageTemplates.tests import util
 from Products.PageTemplates.PageTemplate import PageTemplate
+from Products.PageTemplates.interfaces import IUnicodeEncodingConflictResolver
+from Products.PageTemplates.unicodeconflictresolver import 
DefaultUnicodeEncodingConflictResolver
 from Acquisition import Implicit
 from AccessControl import SecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
@@ -50,6 +53,7 @@
     def setUp(self):
         super(DTMLTests, self).setUp()
         zope.component.provideAdapter(DefaultTraversable, (None,))
+        provideUtility(DefaultUnicodeEncodingConflictResolver, 
IUnicodeEncodingConflictResolver)
 
         self.t = AqPageTemplate()
         self.policy = UnitTestSecurityPolicy()

Modified: 
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/testHTMLTests.py
===================================================================
--- Zope/branches/2.10/lib/python/Products/PageTemplates/tests/testHTMLTests.py 
2007-01-07 12:07:57 UTC (rev 71761)
+++ Zope/branches/2.10/lib/python/Products/PageTemplates/tests/testHTMLTests.py 
2007-01-07 12:14:31 UTC (rev 71762)
@@ -14,11 +14,14 @@
 import unittest
 
 import zope.component.testing
+from zope.component import provideUtility
 from zope.traversing.adapters import DefaultTraversable
 from Products.PageTemplates.tests import util
 from Products.PageTemplates.PageTemplate import PageTemplate
 from Products.PageTemplates.GlobalTranslationService import \
      setGlobalTranslationService
+from Products.PageTemplates.interfaces import IUnicodeEncodingConflictResolver
+from Products.PageTemplates.unicodeconflictresolver import 
DefaultUnicodeEncodingConflictResolver
 from AccessControl import SecurityManager
 from AccessControl.SecurityManagement import noSecurityManager
 
@@ -67,6 +70,8 @@
         super(HTMLTests, self).setUp()
         zope.component.provideAdapter(DefaultTraversable, (None,))
 
+        provideUtility(DefaultUnicodeEncodingConflictResolver, 
IUnicodeEncodingConflictResolver)
+
         self.folder = f = Folder()
         f.laf = AqPageTemplate()
         f.t = AqPageTemplate()

Modified: 
Zope/branches/2.10/lib/python/Products/PageTemplates/tests/test_ptfile.py
===================================================================
--- Zope/branches/2.10/lib/python/Products/PageTemplates/tests/test_ptfile.py   
2007-01-07 12:07:57 UTC (rev 71761)
+++ Zope/branches/2.10/lib/python/Products/PageTemplates/tests/test_ptfile.py   
2007-01-07 12:14:31 UTC (rev 71762)
@@ -15,6 +15,12 @@
 
     TEMPFILENAME = tempfile.mktemp(".zpt")
 
+    def setUp(self):
+        from zope.component import provideUtility
+        from Products.PageTemplates.interfaces import 
IUnicodeEncodingConflictResolver
+        from Products.PageTemplates.unicodeconflictresolver import 
DefaultUnicodeEncodingConflictResolver
+        provideUtility(DefaultUnicodeEncodingConflictResolver, 
IUnicodeEncodingConflictResolver)
+
     def tearDown(self):
         if os.path.exists(self.TEMPFILENAME):
             os.unlink(self.TEMPFILENAME)

_______________________________________________
Zope-Checkins maillist  -  Zope-Checkins@zope.org
http://mail.zope.org/mailman/listinfo/zope-checkins

Reply via email to