[Zope-Checkins] SVN: Zope/trunk/src/Products/Five/browser/tests/test_i18n.py Fixed test to work with fewer TAL linebreaks

2011-08-23 Thread Hanno Schlichting 
Log message for revision 122667:
  Fixed test to work with fewer TAL linebreaks
  

Changed:
  U   Zope/trunk/src/Products/Five/browser/tests/test_i18n.py

-=-
Modified: Zope/trunk/src/Products/Five/browser/tests/test_i18n.py
===
--- Zope/trunk/src/Products/Five/browser/tests/test_i18n.py 2011-08-22 
19:46:35 UTC (rev 122666)
+++ Zope/trunk/src/Products/Five/browser/tests/test_i18n.py 2011-08-23 
08:31:24 UTC (rev 122667)
@@ -66,8 +66,7 @@
   pDies sind 4 explizite Nachrichten/p
   table summary=Dies ist ein Attribut
   /table
-  table summary=Explizite Zusammenfassung
- title=Expliziter Titel
+  table summary=Explizite Zusammenfassung title=Expliziter Titel
   /table
   pDies ist eine Nachricht/p
   pDies ist eine Nachricht/p

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/branches/2.13/ Yet another ZCatalog

2011-08-23 Thread Hanno Schlichting 
Log message for revision 122672:
  Yet another ZCatalog
  

Changed:
  U   Zope/branches/2.13/doc/CHANGES.rst
  U   Zope/branches/2.13/versions.cfg

-=-
Modified: Zope/branches/2.13/doc/CHANGES.rst
===
--- Zope/branches/2.13/doc/CHANGES.rst  2011-08-23 08:49:34 UTC (rev 122671)
+++ Zope/branches/2.13/doc/CHANGES.rst  2011-08-23 08:52:44 UTC (rev 122672)
@@ -11,7 +11,10 @@
 Bugs Fixed
 ++
 
+- Updated distributions:
 
+  - Products.ZCatalog = 2.13.20
+
 2.13.9 (2011-08-20)
 ---
 

Modified: Zope/branches/2.13/versions.cfg
===
--- Zope/branches/2.13/versions.cfg 2011-08-23 08:49:34 UTC (rev 122671)
+++ Zope/branches/2.13/versions.cfg 2011-08-23 08:52:44 UTC (rev 122672)
@@ -22,7 +22,7 @@
 Products.OFSP = 2.13.2
 Products.PythonScripts = 2.13.0
 Products.StandardCacheManagers = 2.13.0
-Products.ZCatalog = 2.13.19
+Products.ZCatalog = 2.13.20
 Products.ZCTextIndex = 2.13.3
 Record = 2.13.0
 tempstorage = 2.12.1

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/versions.cfg ZCatalog 2.13.20

2011-08-23 Thread Hanno Schlichting 
Log message for revision 122673:
  ZCatalog 2.13.20
  

Changed:
  U   Zope/trunk/versions.cfg

-=-
Modified: Zope/trunk/versions.cfg
===
--- Zope/trunk/versions.cfg 2011-08-23 08:52:44 UTC (rev 122672)
+++ Zope/trunk/versions.cfg 2011-08-23 08:53:15 UTC (rev 122673)
@@ -16,7 +16,7 @@
 nt-svcutils = 2.13.0
 Persistence = 2.13.2
 Products.OFSP = 2.13.2
-Products.ZCatalog = 2.13.19
+Products.ZCatalog = 2.13.20
 Products.ZCTextIndex = 2.13.3
 Record = 2.13.0
 tempstorage = 2.12.1

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/ Adjust to new zope.pagetemplate macros lookup.

2011-08-23 Thread Hanno Schlichting 
Log message for revision 122683:
  Adjust to new zope.pagetemplate macros lookup.
  

Changed:
  U   Zope/trunk/doc/CHANGES.rst
  U   Zope/trunk/setup.py
  U   Zope/trunk/src/Products/PageTemplates/PageTemplate.py

-=-
Modified: Zope/trunk/doc/CHANGES.rst
===
--- Zope/trunk/doc/CHANGES.rst  2011-08-23 11:09:18 UTC (rev 122682)
+++ Zope/trunk/doc/CHANGES.rst  2011-08-23 11:14:07 UTC (rev 122683)
@@ -19,6 +19,8 @@
 Features Added
 ++
 
+- Adjust to new zope.pagetemplate macros lookup.
+
 - Optimized the `OFS.Traversable.getPhysicalPath` method to avoid excessive
   amounts of method calls.
 

Modified: Zope/trunk/setup.py
===
--- Zope/trunk/setup.py 2011-08-23 11:09:18 UTC (rev 122682)
+++ Zope/trunk/setup.py 2011-08-23 11:14:07 UTC (rev 122683)
@@ -87,7 +87,7 @@
   'zope.interface',
   'zope.lifecycleevent',
   'zope.location',
-  'zope.pagetemplate',
+  'zope.pagetemplate = 3.6.1',
   'zope.processlifetime',
   'zope.proxy',
   'zope.ptresource',

Modified: Zope/trunk/src/Products/PageTemplates/PageTemplate.py
===
--- Zope/trunk/src/Products/PageTemplates/PageTemplate.py   2011-08-23 
11:09:18 UTC (rev 122682)
+++ Zope/trunk/src/Products/PageTemplates/PageTemplate.py   2011-08-23 
11:14:07 UTC (rev 122683)
@@ -59,7 +59,7 @@
 'Page Template %s has errors: %s' % (
 self.id, self._v_errors
 ))
-return self._v_macros
+return self._v_program.macros
 
 # these methods are reimplemented or duplicated here because of
 # different call signatures in the Zope 2 world

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins

[Zope-Checkins] SVN: Zope/trunk/src/Products/PageTemplates/tests/ Fix formatting output differences thx to less TAL-wrapping

2011-08-23 Thread Hanno Schlichting 
Log message for revision 122684:
  Fix formatting output differences thx to less TAL-wrapping
  

Changed:
  U   Zope/trunk/src/Products/PageTemplates/tests/input/TeeShop1.html
  U   Zope/trunk/src/Products/PageTemplates/tests/output/TeeShop1.html

-=-
Modified: Zope/trunk/src/Products/PageTemplates/tests/input/TeeShop1.html
===
--- Zope/trunk/src/Products/PageTemplates/tests/input/TeeShop1.html 
2011-08-23 11:14:07 UTC (rev 122683)
+++ Zope/trunk/src/Products/PageTemplates/tests/input/TeeShop1.html 
2011-08-23 11:26:49 UTC (rev 122684)
@@ -46,7 +46,7 @@
   on your tee./span/td
 td align=right width=1% rowspan=2 
   pimg src=/images/smlatee.jpg width=200 height=200
- tal:attributes=src 
string:/images/${product/image}/p
+  tal:attributes=src 
string:/images/${product/image}/p
 /td
   /tr
   tr 

Modified: Zope/trunk/src/Products/PageTemplates/tests/output/TeeShop1.html
===
--- Zope/trunk/src/Products/PageTemplates/tests/output/TeeShop1.html
2011-08-23 11:14:07 UTC (rev 122683)
+++ Zope/trunk/src/Products/PageTemplates/tests/output/TeeShop1.html
2011-08-23 11:26:49 UTC (rev 122684)
@@ -43,13 +43,12 @@
 td colspan=2 class=bodylist height=200 
valign=topbDescription: 
   /bThis is the tee for those who LOVE Zope. Show your heart 
on your tee./td
 td align=right width=1% rowspan=2 
-  pimg src=/images/smlatee.jpg
-  width=200 height=200/p
+  pimg src=/images/smlatee.jpg width=200 
height=200/p
 /td
   /tr
   tr 
 td class=bodylistimg src=images/clear.gif width=150 
height=10/td
-  td class=bodylistbPrice/b:12.99/td
+td class=bodylistbPrice/b:12.99/td
   /tr
 /table
   /td
@@ -61,8 +60,7 @@
 td colspan=2 class=bodylist height=200 
valign=topbDescription: 
   /bThis is the tee for Jim Fulton. He's the Zope Pope!/td
 td align=right width=1% rowspan=2 
-  pimg src=/images/smpztee.jpg
-  width=200 height=200/p
+  pimg src=/images/smpztee.jpg width=200 
height=200/p
 /td
   /tr
   tr 

___
Zope-Checkins maillist  -  Zope-Checkins@zope.org
https://mail.zope.org/mailman/listinfo/zope-checkins