From evan at 4-am.com  Wed Oct  1 13:14:58 2003
From: evan at 4-am.com (Evan Simpson)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/TAL/tests -
	test_talinterpreter.py:1.6.12.3
Message-ID: <200310011714.h91HEwr10649@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/TAL/tests
In directory cvs.zope.org:/tmp/cvs-serv10145/lib/python/TAL/tests

Modified Files:
      Tag: Zope-2_7-branch
	test_talinterpreter.py 
Log Message:
Completely fix bug #721 by using attrEscape instead of cgi.escape for
dynamic attribute values as well as static values.


=== Releases/Zope/lib/python/TAL/tests/test_talinterpreter.py 1.6.12.2 => 1.6.12.3 ===
--- Releases/Zope/lib/python/TAL/tests/test_talinterpreter.py:1.6.12.2	Fri Aug 15 10:14:40 2003
+++ Releases/Zope/lib/python/TAL/tests/test_talinterpreter.py	Wed Oct  1 13:14:57 2003
@@ -221,7 +221,7 @@
         self.compare(INPUT, EXPECTED)
 
     def check_entities(self):
-        INPUT = ('<img tal:define="foo nothing" '
+        INPUT = ('<img tal:attributes="alt default" '
                  'alt="&a; &#1; &#x0a; &a &#45 &; &#0a; <>" />')
         EXPECTED = ('<img alt="&a; &#1; &#x0a; '
                     '&amp;a &amp;#45 &amp;; &amp;#0a; &lt;&gt;" />\n')



From evan at 4-am.com  Wed Oct  1 13:15:27 2003
From: evan at 4-am.com (Evan Simpson)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/TAL -
	TALInterpreter.py:1.78.4.3
Message-ID: <200310011715.h91HFRZ10812@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/TAL
In directory cvs.zope.org:/tmp/cvs-serv10145/lib/python/TAL

Modified Files:
      Tag: Zope-2_7-branch
	TALInterpreter.py 
Log Message:
Completely fix bug #721 by using attrEscape instead of cgi.escape for
dynamic attribute values as well as static values.


=== Releases/Zope/lib/python/TAL/TALInterpreter.py 1.78.4.2 => 1.78.4.3 ===
--- Releases/Zope/lib/python/TAL/TALInterpreter.py:1.78.4.2	Fri Aug 15 10:14:37 2003
+++ Releases/Zope/lib/python/TAL/TALInterpreter.py	Wed Oct  1 13:14:56 2003
@@ -24,7 +24,7 @@
 from StringIO import StringIO
 from DocumentTemplate.DT_Util import ustr
 
-from TALDefs import TAL_VERSION, TALError, METALError
+from TALDefs import TAL_VERSION, TALError, METALError, attrEscape
 from TALDefs import isCurrentVersion, getProgramVersion, getProgramMode
 from TALGenerator import TALGenerator
 from TranslationContext import TranslationContext
@@ -336,7 +336,7 @@
         if value is None:
             value = name
         else:
-            value = '%s="%s"' % (name, escape(value, 1))
+            value = '%s="%s"' % (name, attrEscape(value))
         return 1, name, value
 
     def attrAction_tal(self, item):
@@ -369,7 +369,7 @@
                     value = translated
             if value is None:
                 value = name
-            value = '%s="%s"' % (name, escape(value, 1))
+            value = '%s="%s"' % (name, attrEscape(value))
         return ok, name, value
     bytecode_handlers["<attrAction>"] = attrAction
 



From evan at 4-am.com  Wed Oct  1 13:27:41 2003
From: evan at 4-am.com (Evan Simpson)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/TAL/tests -
	test_talinterpreter.py:1.9
Message-ID: <200310011727.h91HRfu12835@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/TAL/tests
In directory cvs.zope.org:/tmp/cvs-serv12794/lib/python/TAL/tests

Modified Files:
	test_talinterpreter.py 
Log Message:
Completely fix bug #721 by using attrEscape instead of cgi.escape for
dynamic attribute values as well as static values.


=== Releases/Zope/lib/python/TAL/tests/test_talinterpreter.py 1.8 => 1.9 ===
--- Releases/Zope/lib/python/TAL/tests/test_talinterpreter.py:1.8	Fri Aug 15 09:58:43 2003
+++ Releases/Zope/lib/python/TAL/tests/test_talinterpreter.py	Wed Oct  1 13:27:40 2003
@@ -221,7 +221,7 @@
         self.compare(INPUT, EXPECTED)
 
     def check_entities(self):
-        INPUT = ('<img tal:define="foo nothing" '
+        INPUT = ('<img tal:attributes="alt default" '
                  'alt="&a; &#1; &#x0a; &a &#45 &; &#0a; <>" />')
         EXPECTED = ('<img alt="&a; &#1; &#x0a; '
                     '&amp;a &amp;#45 &amp;; &amp;#0a; &lt;&gt;" />\n')



From evan at 4-am.com  Wed Oct  1 13:28:11 2003
From: evan at 4-am.com (Evan Simpson)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/TAL - TALInterpreter.py:1.81
Message-ID: <200310011728.h91HSBr12995@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/TAL
In directory cvs.zope.org:/tmp/cvs-serv12794/lib/python/TAL

Modified Files:
	TALInterpreter.py 
Log Message:
Completely fix bug #721 by using attrEscape instead of cgi.escape for
dynamic attribute values as well as static values.


=== Releases/Zope/lib/python/TAL/TALInterpreter.py 1.80 => 1.81 ===
--- Releases/Zope/lib/python/TAL/TALInterpreter.py:1.80	Fri Aug 15 09:58:38 2003
+++ Releases/Zope/lib/python/TAL/TALInterpreter.py	Wed Oct  1 13:27:40 2003
@@ -24,7 +24,7 @@
 from StringIO import StringIO
 from DocumentTemplate.DT_Util import ustr
 
-from TALDefs import TAL_VERSION, TALError, METALError
+from TALDefs import TAL_VERSION, TALError, METALError, attrEscape
 from TALDefs import isCurrentVersion, getProgramVersion, getProgramMode
 from TALGenerator import TALGenerator
 from TranslationContext import TranslationContext
@@ -336,7 +336,7 @@
         if value is None:
             value = name
         else:
-            value = '%s="%s"' % (name, escape(value, 1))
+            value = '%s="%s"' % (name, attrEscape(value))
         return 1, name, value
 
     def attrAction_tal(self, item):
@@ -369,7 +369,7 @@
                     value = translated
             if value is None:
                 value = name
-            value = '%s="%s"' % (name, escape(value, 1))
+            value = '%s="%s"' % (name, attrEscape(value))
         return ok, name, value
     bytecode_handlers["<attrAction>"] = attrAction
 



From evan at 4-am.com  Fri Oct  3 14:54:02 2003
From: evan at 4-am.com (Evan Simpson)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/TAL -
	TALInterpreter.py:1.78.4.4
Message-ID: <200310031854.h93Is2I24141@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/TAL
In directory cvs.zope.org:/tmp/cvs-serv23919/lib/python/TAL

Modified Files:
      Tag: Zope-2_7-branch
	TALInterpreter.py 
Log Message:
Back off a bit on attribute escape changes, so that tal:attribute values
other than 'default' are still fully escaped.


=== Releases/Zope/lib/python/TAL/TALInterpreter.py 1.78.4.3 => 1.78.4.4 ===
--- Releases/Zope/lib/python/TAL/TALInterpreter.py:1.78.4.3	Wed Oct  1 13:14:56 2003
+++ Releases/Zope/lib/python/TAL/TALInterpreter.py	Fri Oct  3 14:54:01 2003
@@ -361,6 +361,8 @@
                 if evalue is None:
                     ok = 0
                 value = evalue
+        else:
+            evalue = None
 
         if ok:
             if xlat:
@@ -369,7 +371,11 @@
                     value = translated
             if value is None:
                 value = name
-            value = '%s="%s"' % (name, attrEscape(value))
+            elif evalue is self.Default:
+                value = attrEscape(value)
+            else:
+                value = escape(value)
+            value = '%s="%s"' % (name, value)
         return ok, name, value
     bytecode_handlers["<attrAction>"] = attrAction
 



From evan at 4-am.com  Fri Oct  3 14:54:48 2003
From: evan at 4-am.com (Evan Simpson)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/TAL - TALInterpreter.py:1.82
Message-ID: <200310031854.h93Ism924267@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/TAL
In directory cvs.zope.org:/tmp/cvs-serv24248/lib/python/TAL

Modified Files:
	TALInterpreter.py 
Log Message:
Back off a bit on attribute escaping so that tal:attribute values other than
'default' are still fully escaped.


=== Releases/Zope/lib/python/TAL/TALInterpreter.py 1.81 => 1.82 ===
--- Releases/Zope/lib/python/TAL/TALInterpreter.py:1.81	Wed Oct  1 13:27:40 2003
+++ Releases/Zope/lib/python/TAL/TALInterpreter.py	Fri Oct  3 14:54:47 2003
@@ -361,6 +361,8 @@
                 if evalue is None:
                     ok = 0
                 value = evalue
+        else:
+            evalue = None
 
         if ok:
             if xlat:
@@ -369,7 +371,11 @@
                     value = translated
             if value is None:
                 value = name
-            value = '%s="%s"' % (name, attrEscape(value))
+            elif evalue is self.Default:
+                value = attrEscape(value)
+            else:
+                value = escape(value)
+            value = '%s="%s"' % (name, value)
         return ok, name, value
     bytecode_handlers["<attrAction>"] = attrAction
 



From shane at zope.com  Sat Oct  4 14:56:59 2003
From: shane at zope.com (Shane Hathaway)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] 
	CVS: Releases/Zope/lib/python/Products/PageTemplates/tests/input
	- DTML1.html:1.2
Message-ID: <200310041856.h94Iuxt31686@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/Products/PageTemplates/tests/input
In directory cvs.zope.org:/tmp/cvs-serv31504/tests/input

Modified Files:
	DTML1.html 
Log Message:
Added "context", a synonym of "here", to page template namespaces.

This unifies the convention in templates, scripts, and Zope 3.



=== Releases/Zope/lib/python/Products/PageTemplates/tests/input/DTML1.html 1.1 => 1.2 ===
--- Releases/Zope/lib/python/Products/PageTemplates/tests/input/DTML1.html:1.1	Fri Mar 23 12:19:20 2001
+++ Releases/Zope/lib/python/Products/PageTemplates/tests/input/DTML1.html	Sat Oct  4 14:56:58 2003
@@ -2,18 +2,18 @@
   <head><title>Test of documentation templates</title></head>
   <body>
       <span tal:replace="nothing"> blah </span>
-      <dl tal:condition="here/args">
+      <dl tal:condition="context/args">
         <dt>The arguments to this test program were:</dt>
         <dd>
           <ul>
-            <li tal:repeat="arg here/args">
+            <li tal:repeat="arg context/args">
               Argument number <span tal:replace="arg/num">99</span>
               is <span tal:replace="arg/arg">default</span>
             </li>
           </ul>
         </dd>
       </dl>
-      <p tal:condition="not:here/args">No arguments were given.</p>
+      <p tal:condition="not:context/args">No arguments were given.</p>
       And thats da trooth.
   </body>
 </html>



From shane at zope.com  Sat Oct  4 14:57:29 2003
From: shane at zope.com (Shane Hathaway)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/Products/PageTemplates -
	PageTemplate.py:1.31 PageTemplateFile.py:1.29
	ZopePageTemplate.py:1.46
Message-ID: <200310041857.h94IvTQ31854@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv31504

Modified Files:
	PageTemplate.py PageTemplateFile.py ZopePageTemplate.py 
Log Message:
Added "context", a synonym of "here", to page template namespaces.

This unifies the convention in templates, scripts, and Zope 3.



=== Releases/Zope/lib/python/Products/PageTemplates/PageTemplate.py 1.30 => 1.31 ===
--- Releases/Zope/lib/python/Products/PageTemplates/PageTemplate.py:1.30	Fri Mar 21 14:17:32 2003
+++ Releases/Zope/lib/python/Products/PageTemplates/PageTemplate.py	Sat Oct  4 14:56:58 2003
@@ -69,6 +69,7 @@
         parent = getattr(self, 'aq_parent', None)
         if parent is not None:
             c['here'] = parent
+            c['context'] = parent
             c['container'] = self.aq_inner.aq_parent
             while parent is not None:
                 self = parent


=== Releases/Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.28 => 1.29 ===
--- Releases/Zope/lib/python/Products/PageTemplates/PageTemplateFile.py:1.28	Tue Apr 22 13:48:05 2003
+++ Releases/Zope/lib/python/Products/PageTemplates/PageTemplateFile.py	Sat Oct  4 14:56:58 2003
@@ -70,8 +70,10 @@
 
     def pt_getContext(self):
         root = self.getPhysicalRoot()
+        context = self._getContext()
         c = {'template': self,
-             'here': self._getContext(),
+             'here': context,
+             'context': context,
              'container': self._getContainer(),
              'nothing': None,
              'options': {},


=== Releases/Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.45 => 1.46 ===
--- Releases/Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py:1.45	Sun Jul  6 06:43:56 2003
+++ Releases/Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py	Sat Oct  4 14:56:58 2003
@@ -172,8 +172,10 @@
 
     def pt_getContext(self):
         root = self.getPhysicalRoot()
+        context = self._getContext()
         c = {'template': self,
-             'here': self._getContext(),
+             'here': context,
+             'context': context,
              'container': self._getContainer(),
              'nothing': None,
              'options': {},



From shane at zope.com  Sat Oct  4 14:57:58 2003
From: shane at zope.com (Shane Hathaway)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] 
	CVS: Releases/Zope/lib/python/Products/PageTemplates/tests/input
	- DTML1.html:1.1.178.1
Message-ID: <200310041857.h94Ivw331889@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/Products/PageTemplates/tests/input
In directory cvs.zope.org:/tmp/cvs-serv31859/tests/input

Modified Files:
      Tag: Zope-2_7-branch
	DTML1.html 
Log Message:
Added "context", a synonym of "here", to page template namespaces.

This unifies the convention in templates, scripts, and Zope 3.


=== Releases/Zope/lib/python/Products/PageTemplates/tests/input/DTML1.html 1.1 => 1.1.178.1 ===
--- Releases/Zope/lib/python/Products/PageTemplates/tests/input/DTML1.html:1.1	Fri Mar 23 12:19:20 2001
+++ Releases/Zope/lib/python/Products/PageTemplates/tests/input/DTML1.html	Sat Oct  4 14:57:57 2003
@@ -2,18 +2,18 @@
   <head><title>Test of documentation templates</title></head>
   <body>
       <span tal:replace="nothing"> blah </span>
-      <dl tal:condition="here/args">
+      <dl tal:condition="context/args">
         <dt>The arguments to this test program were:</dt>
         <dd>
           <ul>
-            <li tal:repeat="arg here/args">
+            <li tal:repeat="arg context/args">
               Argument number <span tal:replace="arg/num">99</span>
               is <span tal:replace="arg/arg">default</span>
             </li>
           </ul>
         </dd>
       </dl>
-      <p tal:condition="not:here/args">No arguments were given.</p>
+      <p tal:condition="not:context/args">No arguments were given.</p>
       And thats da trooth.
   </body>
 </html>



From shane at zope.com  Sat Oct  4 14:58:28 2003
From: shane at zope.com (Shane Hathaway)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/Products/PageTemplates -
	PageTemplate.py:1.30.10.1 PageTemplateFile.py:1.28.4.1
	ZopePageTemplate.py:1.44.44.3
Message-ID: <200310041858.h94IwSk32055@cvs.baymountain.com>

Update of /cvs-repository/Releases/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv31859

Modified Files:
      Tag: Zope-2_7-branch
	PageTemplate.py PageTemplateFile.py ZopePageTemplate.py 
Log Message:
Added "context", a synonym of "here", to page template namespaces.

This unifies the convention in templates, scripts, and Zope 3.


=== Releases/Zope/lib/python/Products/PageTemplates/PageTemplate.py 1.30 => 1.30.10.1 ===
--- Releases/Zope/lib/python/Products/PageTemplates/PageTemplate.py:1.30	Fri Mar 21 14:17:32 2003
+++ Releases/Zope/lib/python/Products/PageTemplates/PageTemplate.py	Sat Oct  4 14:57:57 2003
@@ -69,6 +69,7 @@
         parent = getattr(self, 'aq_parent', None)
         if parent is not None:
             c['here'] = parent
+            c['context'] = parent
             c['container'] = self.aq_inner.aq_parent
             while parent is not None:
                 self = parent


=== Releases/Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.28 => 1.28.4.1 ===
--- Releases/Zope/lib/python/Products/PageTemplates/PageTemplateFile.py:1.28	Tue Apr 22 13:48:05 2003
+++ Releases/Zope/lib/python/Products/PageTemplates/PageTemplateFile.py	Sat Oct  4 14:57:57 2003
@@ -70,8 +70,10 @@
 
     def pt_getContext(self):
         root = self.getPhysicalRoot()
+        context = self._getContext()
         c = {'template': self,
-             'here': self._getContext(),
+             'here': context,
+             'context': context,
              'container': self._getContainer(),
              'nothing': None,
              'options': {},


=== Releases/Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.44.44.2 => 1.44.44.3 ===
--- Releases/Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py:1.44.44.2	Mon Jul 21 12:35:56 2003
+++ Releases/Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py	Sat Oct  4 14:57:57 2003
@@ -172,8 +172,10 @@
 
     def pt_getContext(self):
         root = self.getPhysicalRoot()
+        context = self._getContext()
         c = {'template': self,
-             'here': self._getContext(),
+             'here': context,
+             'context': context,
              'container': self._getContainer(),
              'nothing': None,
              'options': {},



From andreas at andreas-jung.com  Tue Oct 21 08:21:53 2003
From: andreas at andreas-jung.com (Andreas Jung)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/ZTUtils - Iterator.py:1.10
Message-ID: <200310211221.h9LCLrW16985@cvs.baymountain.com>

Update of /cvs-repository/Zope/lib/python/ZTUtils
In directory cvs.zope.org:/tmp/cvs-serv16952/lib/python/ZTUtils

Modified Files:
	Iterator.py 
Log Message:
     - Collector #1087: ZPT: "repeat/item/length" did not work as documented
       in the Zope Book.


=== Zope/lib/python/ZTUtils/Iterator.py 1.9 => 1.10 ===
--- Zope/lib/python/ZTUtils/Iterator.py:1.9	Wed Oct  9 13:33:49 2002
+++ Zope/lib/python/ZTUtils/Iterator.py	Tue Oct 21 08:21:52 2003
@@ -96,6 +96,9 @@
         if self.end: return 1
         return not self.same_part(name, self.item, self._next)
 
+    def length(self):
+        return len(self.seq)
+
     def same_part(self, name, ob1, ob2):
         if name is None:
             return ob1 == ob2



From andreas at andreas-jung.com  Tue Oct 21 08:25:51 2003
From: andreas at andreas-jung.com (Andreas Jung)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/ZTUtils - Iterator.py:1.9.42.1
Message-ID: <200310211225.h9LCPpr17659@cvs.baymountain.com>

Update of /cvs-repository/Zope/lib/python/ZTUtils
In directory cvs.zope.org:/tmp/cvs-serv17620/lib/python/ZTUtils

Modified Files:
      Tag: Zope-2_7-branch
	Iterator.py 
Log Message:

     - Collector #1087: ZPT: "repeat/item/length" did not work as documented
       in the Zope Book.


=== Zope/lib/python/ZTUtils/Iterator.py 1.9 => 1.9.42.1 ===
--- Zope/lib/python/ZTUtils/Iterator.py:1.9	Wed Oct  9 13:33:49 2002
+++ Zope/lib/python/ZTUtils/Iterator.py	Tue Oct 21 08:25:50 2003
@@ -96,6 +96,9 @@
         if self.end: return 1
         return not self.same_part(name, self.item, self._next)
 
+    def length(self):
+        return len(self.seq)
+
     def same_part(self, name, ob1, ob2):
         if name is None:
             return ob1 == ob2



From andreas at andreas-jung.com  Tue Oct 21 11:31:09 2003
From: andreas at andreas-jung.com (Andreas Jung)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates -
	ZopePageTemplate.py:1.47
Message-ID: <200310211531.h9LFV9k17151@cvs.baymountain.com>

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv16983/lib/python/Products/PageTemplates

Modified Files:
	ZopePageTemplate.py 
Log Message:
workaround for COllector #1081


=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.46 => 1.47 ===
--- Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py:1.46	Sat Oct  4 14:56:58 2003
+++ Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py	Tue Oct 21 11:31:08 2003
@@ -70,7 +70,7 @@
         + SimpleItem.manage_options \
         + Cacheable.manage_options
 
-    _properties=({'id':'title', 'type': 'string', 'mode': 'w'},
+    _properties=({'id':'title', 'type': 'string', 'mode': 'wd'},
                  {'id':'content_type', 'type':'string', 'mode': 'w'},
                  {'id':'expand', 'type':'boolean', 'mode': 'w'},
                  )



From andreas at andreas-jung.com  Tue Oct 21 11:31:40 2003
From: andreas at andreas-jung.com (Andreas Jung)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates -
	ZopePageTemplate.py:1.44.44.4
Message-ID: <200310211531.h9LFVeW17181@cvs.baymountain.com>

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates
In directory cvs.zope.org:/tmp/cvs-serv17162/lib/python/Products/PageTemplates

Modified Files:
      Tag: Zope-2_7-branch
	ZopePageTemplate.py 
Log Message:
workaround for collector #1081


=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.44.44.3 => 1.44.44.4 ===
--- Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py:1.44.44.3	Sat Oct  4 14:57:57 2003
+++ Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py	Tue Oct 21 11:31:40 2003
@@ -70,7 +70,7 @@
         + SimpleItem.manage_options \
         + Cacheable.manage_options
 
-    _properties=({'id':'title', 'type': 'string', 'mode': 'w'},
+    _properties=({'id':'title', 'type': 'string', 'mode': 'wd'},
                  {'id':'content_type', 'type':'string', 'mode': 'w'},
                  {'id':'expand', 'type':'boolean', 'mode': 'w'},
                  )



From cvs-admin at zope.org  Thu Oct 23 09:39:48 2003
From: cvs-admin at zope.org (Fred Drake)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/TAL/tests - test_xmlparser.py:1.8
Message-ID: <200310231339.h9NDdmPa022644@cvs.zope.org>

Update of /cvs-repository/Zope/lib/python/TAL/tests
In directory cvs.zope.org:/tmp/cvs-serv22622

Modified Files:
	test_xmlparser.py 
Log Message:
Fix error in test data:  A test document used an unbound namespace
prefix while using Expat in namespace mode; this violates the "Prefix
Declared" namespace constraint.  Expat 1.95.7 now checks this
constraint properly, so raises an exception.


=== Zope/lib/python/TAL/tests/test_xmlparser.py 1.7 => 1.8 ===
--- Zope/lib/python/TAL/tests/test_xmlparser.py:1.7	Thu Aug 22 15:43:08 2002
+++ Zope/lib/python/TAL/tests/test_xmlparser.py	Thu Oct 23 09:39:47 2003
@@ -185,8 +185,8 @@
             ])
 
     def check_attr_funky_names(self):
-        self._run_check("""<a a.b='v' c:d='v' e-f='v'/>""", [
-            ("starttag", "a", ["a.b", "v", "c:d", "v", "e-f", "v"]),
+        self._run_check("""<a a.b='v' e-f='v'/>""", [
+            ("starttag", "a", ["a.b", "v", "e-f", "v"]),
             ("endtag", "a"),
             ])
 



From cvs-admin at zope.org  Fri Oct 24 12:01:43 2003
From: cvs-admin at zope.org (Fred Drake)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests/output
	- StringExpression.html:1.3.44.1
Message-ID: <200310241601.h9OG1h3G003305@cvs.zope.org>

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates/tests/output
In directory cvs.zope.org:/tmp/cvs-serv3275/lib/python/Products/PageTemplates/tests/output

Modified Files:
      Tag: Zope-2_7-branch
	StringExpression.html 
Log Message:
Fix spurious error in PageTemplates; no longer rely on the str() of exception
objects since the value of their str() is not part of their API, and can
vary between releases.


=== Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html 1.3 => 1.3.44.1 ===
--- Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html:1.3	Tue Oct  1 11:52:56 2002
+++ Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html	Fri Oct 24 12:01:42 2003
@@ -3,8 +3,12 @@
    <title>Hello World!</title>
 </head>
 <body>
-  Error:x
-  Error:x
+  <!-- These next two on-error expressions are very fragile; there's
+  not a lot we can do without fairly interesting exception
+  objects and not be subject to variations in the str() of the
+  exception object. -->
+  Error:10
+  Error:11
   <hr />
 </body>
 </html>



From cvs-admin at zope.org  Fri Oct 24 12:01:52 2003
From: cvs-admin at zope.org (Fred Drake)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests/output
	- StringExpression.html:1.4
Message-ID: <200310241601.h9OG1qIS003352@cvs.zope.org>

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates/tests/output
In directory cvs.zope.org:/tmp/cvs-serv3322/lib/python/Products/PageTemplates/tests/output

Modified Files:
	StringExpression.html 
Log Message:
Fix spurious error in PageTemplates; no longer rely on the str() of exception
objects since the value of their str() is not part of their API, and can
vary between releases.


=== Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html 1.3 => 1.4 ===
--- Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html:1.3	Tue Oct  1 11:52:56 2002
+++ Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html	Fri Oct 24 12:01:51 2003
@@ -3,8 +3,12 @@
    <title>Hello World!</title>
 </head>
 <body>
-  Error:x
-  Error:x
+  <!-- These next two on-error expressions are very fragile; there's
+  not a lot we can do without fairly interesting exception
+  objects and not be subject to variations in the str() of the
+  exception object. -->
+  Error:10
+  Error:11
   <hr />
 </body>
 </html>



From cvs-admin at zope.org  Fri Oct 24 12:02:13 2003
From: cvs-admin at zope.org (Fred Drake)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests/input -
	StringExpression.html:1.2.44.1
Message-ID: <200310241602.h9OG2DC6003513@cvs.zope.org>

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates/tests/input
In directory cvs.zope.org:/tmp/cvs-serv3275/lib/python/Products/PageTemplates/tests/input

Modified Files:
      Tag: Zope-2_7-branch
	StringExpression.html 
Log Message:
Fix spurious error in PageTemplates; no longer rely on the str() of exception
objects since the value of their str() is not part of their API, and can
vary between releases.


=== Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html 1.2 => 1.2.44.1 ===
--- Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html:1.2	Tue Oct  1 11:52:55 2002
+++ Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html	Fri Oct 24 12:01:42 2003
@@ -3,8 +3,12 @@
    <title tal:content="string:Hello World!">This is the title</title>
 </head>
 <body>
-  <tal:block on-error="string:Error:${error/value}" replace="x" />
-  <tal:block on-error="string:Error:${error/value}">
+  <!-- These next two on-error expressions are very fragile; there's
+       not a lot we can do without fairly interesting exception
+       objects and not be subject to variations in the str() of the
+       exception object. -->
+  <tal:block on-error="string:Error:${error/lineno}" replace="x" />
+  <tal:block on-error="string:Error:${error/lineno}">
     <p tal:content="x">p</p>
   </tal:block>
   <div tal:replace="structure string:&lt;hr /&gt;">rule</div>



From cvs-admin at zope.org  Fri Oct 24 12:02:22 2003
From: cvs-admin at zope.org (Fred Drake)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests/input -
	StringExpression.html:1.3
Message-ID: <200310241602.h9OG2MI0003528@cvs.zope.org>

Update of /cvs-repository/Zope/lib/python/Products/PageTemplates/tests/input
In directory cvs.zope.org:/tmp/cvs-serv3322/lib/python/Products/PageTemplates/tests/input

Modified Files:
	StringExpression.html 
Log Message:
Fix spurious error in PageTemplates; no longer rely on the str() of exception
objects since the value of their str() is not part of their API, and can
vary between releases.


=== Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html 1.2 => 1.3 ===
--- Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html:1.2	Tue Oct  1 11:52:55 2002
+++ Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html	Fri Oct 24 12:01:51 2003
@@ -3,8 +3,12 @@
    <title tal:content="string:Hello World!">This is the title</title>
 </head>
 <body>
-  <tal:block on-error="string:Error:${error/value}" replace="x" />
-  <tal:block on-error="string:Error:${error/value}">
+  <!-- These next two on-error expressions are very fragile; there's
+       not a lot we can do without fairly interesting exception
+       objects and not be subject to variations in the str() of the
+       exception object. -->
+  <tal:block on-error="string:Error:${error/lineno}" replace="x" />
+  <tal:block on-error="string:Error:${error/lineno}">
     <p tal:content="x">p</p>
   </tal:block>
   <div tal:replace="structure string:&lt;hr /&gt;">rule</div>



From cvs-admin at zope.org  Fri Oct 24 16:14:07 2003
From: cvs-admin at zope.org (Evan Simpson)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/ZTUtils - Zope.py:1.11.42.2
Message-ID: <200310242014.h9OKE7tA011262@cvs.zope.org>

Update of /cvs-repository/Releases/Zope/lib/python/ZTUtils
In directory cvs.zope.org:/tmp/cvs-serv11069/lib/python/ZTUtils

Modified Files:
      Tag: Zope-2_7-branch
	Zope.py 
Log Message:
Make Python 2.3 BooleanType work with ZTUtils marshalling.


=== Releases/Zope/lib/python/ZTUtils/Zope.py 1.11.42.1 => 1.11.42.2 ===
--- Releases/Zope/lib/python/ZTUtils/Zope.py:1.11.42.1	Mon Jul 21 12:37:40 2003
+++ Releases/Zope/lib/python/ZTUtils/Zope.py	Fri Oct 24 16:13:36 2003
@@ -36,6 +36,12 @@
 else:
     from AccessControl import Unauthorized
 
+# Support pre-Python 2.3 :-(
+try:
+    from types import BooleanType
+except ImportError:
+    BooleanType = None
+
 class LazyFilter(Lazy):
     # A LazyFilter that checks with the security policy
 
@@ -255,6 +261,8 @@
 def simple_marshal(v):
     if isinstance(v, StringType):
         return ''
+    if BooleanType and isinstance(v, BooleanType):
+        return ':boolean'
     if isinstance(v, IntType):
         return ':int'
     if isinstance(v, FloatType):



From cvs-admin at zope.org  Fri Oct 24 16:16:39 2003
From: cvs-admin at zope.org (Evan Simpson)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Releases/Zope/lib/python/ZTUtils - Zope.py:1.13
Message-ID: <200310242016.h9OKGdAI011616@cvs.zope.org>

Update of /cvs-repository/Releases/Zope/lib/python/ZTUtils
In directory cvs.zope.org:/tmp/cvs-serv11418/lib/python/ZTUtils

Modified Files:
	Zope.py 
Log Message:
Support Python 2.3 BooleanType in ZTUtils.


=== Releases/Zope/lib/python/ZTUtils/Zope.py 1.12 => 1.13 ===
--- Releases/Zope/lib/python/ZTUtils/Zope.py:1.12	Thu Jul  3 17:44:59 2003
+++ Releases/Zope/lib/python/ZTUtils/Zope.py	Fri Oct 24 16:16:08 2003
@@ -36,6 +36,12 @@
 else:
     from AccessControl import Unauthorized
 
+# Support pre-Python 2.3 :-(
+try:
+    from types import BooleanType
+except ImportError:
+    BooleanType = None
+
 class LazyFilter(Lazy):
     # A LazyFilter that checks with the security policy
 
@@ -255,6 +261,8 @@
 def simple_marshal(v):
     if isinstance(v, StringType):
         return ''
+    if BooleanType and isinstance(v, BooleanType):
+        return ':boolean'
     if isinstance(v, IntType):
         return ':int'
     if isinstance(v, FloatType):



From cvs-admin at zope.org  Mon Oct 27 10:37:26 2003
From: cvs-admin at zope.org (Fred Drake)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/TAL/tests -
	test_xmlparser.py:1.7.64.1
Message-ID: <200310271537.h9RFbQUh013692@cvs.zope.org>

Update of /cvs-repository/Zope/lib/python/TAL/tests
In directory cvs.zope.org:/tmp/cvs-serv13673

Modified Files:
      Tag: Zope-2_7-branch
	test_xmlparser.py 
Log Message:
Fix error in test data:  A test document used an unbound namespace
prefix while using Expat in namespace mode; this violates the "Prefix
Declared" namespace constraint.  Expat 1.95.7 now checks this
constraint properly, so raises an exception.


=== Zope/lib/python/TAL/tests/test_xmlparser.py 1.7 => 1.7.64.1 ===
--- Zope/lib/python/TAL/tests/test_xmlparser.py:1.7	Thu Aug 22 15:43:08 2002
+++ Zope/lib/python/TAL/tests/test_xmlparser.py	Mon Oct 27 10:37:25 2003
@@ -185,8 +185,8 @@
             ])
 
     def check_attr_funky_names(self):
-        self._run_check("""<a a.b='v' c:d='v' e-f='v'/>""", [
-            ("starttag", "a", ["a.b", "v", "c:d", "v", "e-f", "v"]),
+        self._run_check("""<a a.b='v' e-f='v'/>""", [
+            ("starttag", "a", ["a.b", "v", "e-f", "v"]),
             ("endtag", "a"),
             ])