From cvs-admin at zope.org  Tue Dec  2 10:37:43 2003
From: cvs-admin at zope.org (Godefroid Chapelle)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates -
	TALES.py:1.38.2.2
Message-ID: <200312021537.hB2FbhDH019030@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_7-branch
	TALES.py 
Log Message:
fix for bug with non ascii old-style strings -- thanks to tesdal


=== Zope/lib/python/Products/PageTemplates/TALES.py 1.38.2.1 => 1.38.2.2 ===
--- Zope/lib/python/Products/PageTemplates/TALES.py:1.38.2.1	Fri Nov 21 07:17:38 2003
+++ Zope/lib/python/Products/PageTemplates/TALES.py	Tue Dec  2 10:37:42 2003
@@ -229,7 +229,7 @@
         if isinstance(text, unicode):
             return text
         else:
-            return unicode(text)
+            return ustr(text)
 
     def evaluateStructure(self, expr):
         return self.evaluate(expr)



From evan at 4-am.com  Thu Dec 11 12:23: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/tests/output -
	test16.html:1.2
Message-ID: <200312111723.hBBHNRDZ003692@cvs.zope.org>

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

Modified Files:
	test16.html 
Log Message:
Collector #1139: tal:attributes didn't escape double quotes.


=== Releases/Zope/lib/python/TAL/tests/output/test16.html 1.1 => 1.2 ===
--- Releases/Zope/lib/python/TAL/tests/output/test16.html:1.1	Thu May 17 00:17:27 2001
+++ Releases/Zope/lib/python/TAL/tests/output/test16.html	Thu Dec 11 12:23:25 2003
@@ -1 +1,3 @@
 <a href="/base/valid/link.html">blah, blah</a>
+
+<input value="a &quot;laser&quot;" />



From evan at 4-am.com  Thu Dec 11 12:24:04 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.83
Message-ID: <200312111724.hBBHO4lo003846@cvs.zope.org>

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

Modified Files:
	TALInterpreter.py 
Log Message:
Collector #1139: tal:attributes didn't escape double quotes.


=== Releases/Zope/lib/python/TAL/TALInterpreter.py 1.82 => 1.83 ===
--- Releases/Zope/lib/python/TAL/TALInterpreter.py:1.82	Fri Oct  3 14:54:47 2003
+++ Releases/Zope/lib/python/TAL/TALInterpreter.py	Thu Dec 11 12:23:24 2003
@@ -374,7 +374,7 @@
             elif evalue is self.Default:
                 value = attrEscape(value)
             else:
-                value = escape(value)
+                value = escape(value, quote=1)
             value = '%s="%s"' % (name, value)
         return ok, name, value
     bytecode_handlers["<attrAction>"] = attrAction



From evan at 4-am.com  Thu Dec 11 12:24:04 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/input -
	test16.html:1.3
Message-ID: <200312111724.hBBHO4VI003820@cvs.zope.org>

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

Modified Files:
	test16.html 
Log Message:
Collector #1139: tal:attributes didn't escape double quotes.


=== Releases/Zope/lib/python/TAL/tests/input/test16.html 1.2 => 1.3 ===
--- Releases/Zope/lib/python/TAL/tests/input/test16.html:1.2	Thu May 17 20:42:08 2001
+++ Releases/Zope/lib/python/TAL/tests/input/test16.html	Thu Dec 11 12:23:25 2003
@@ -1,2 +1,4 @@
 <a href="valid/link.html" 
    tal:attributes="href python:'/base/' + attrs['href']">blah, blah</a>
+
+<input tal:attributes="value string:a &quot;laser&quot;" />



From evan at 4-am.com  Thu Dec 11 12:25:45 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/output -
	test16.html:1.1.194.1
Message-ID: <200312111725.hBBHPjr2005259@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_7-branch
	test16.html 
Log Message:
Collector #1139


=== Releases/Zope/lib/python/TAL/tests/output/test16.html 1.1 => 1.1.194.1 ===
--- Releases/Zope/lib/python/TAL/tests/output/test16.html:1.1	Thu May 17 00:17:27 2001
+++ Releases/Zope/lib/python/TAL/tests/output/test16.html	Thu Dec 11 12:25:38 2003
@@ -1 +1,3 @@
 <a href="/base/valid/link.html">blah, blah</a>
+
+<input value="a &quot;laser&quot;" />



From evan at 4-am.com  Thu Dec 11 12:26:08 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.5
Message-ID: <200312111726.hBBHQ8Dw005425@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_7-branch
	TALInterpreter.py 
Log Message:
Collector #1139


=== Releases/Zope/lib/python/TAL/TALInterpreter.py 1.78.4.4 => 1.78.4.5 ===
--- Releases/Zope/lib/python/TAL/TALInterpreter.py:1.78.4.4	Fri Oct  3 14:54:01 2003
+++ Releases/Zope/lib/python/TAL/TALInterpreter.py	Thu Dec 11 12:25:37 2003
@@ -374,7 +374,7 @@
             elif evalue is self.Default:
                 value = attrEscape(value)
             else:
-                value = escape(value)
+                value = escape(value, quote=1)
             value = '%s="%s"' % (name, value)
         return ok, name, value
     bytecode_handlers["<attrAction>"] = attrAction



From evan at 4-am.com  Thu Dec 11 12:26:09 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/input -
	test16.html:1.2.194.1
Message-ID: <200312111726.hBBHQ9MK005436@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_7-branch
	test16.html 
Log Message:
Collector #1139


=== Releases/Zope/lib/python/TAL/tests/input/test16.html 1.2 => 1.2.194.1 ===
--- Releases/Zope/lib/python/TAL/tests/input/test16.html:1.2	Thu May 17 20:42:08 2001
+++ Releases/Zope/lib/python/TAL/tests/input/test16.html	Thu Dec 11 12:25:38 2003
@@ -1,2 +1,4 @@
 <a href="valid/link.html" 
    tal:attributes="href python:'/base/' + attrs['href']">blah, blah</a>
+
+<input tal:attributes="value string:a &quot;laser&quot;" />



From evan at 4-am.com  Thu Dec 11 13:02:17 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/ZTUtils - Tree.py:1.17
Message-ID: <200312111802.hBBI2H0s011302@cvs.zope.org>

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

Modified Files:
	Tree.py 
Log Message:
Collector #1012: A carefully crafted compressed tree state could violate size limit.  Limit is no longer hardcoded.


=== Releases/Zope/lib/python/ZTUtils/Tree.py 1.16 => 1.17 ===
--- Releases/Zope/lib/python/ZTUtils/Tree.py:1.16	Tue Jul 15 13:01:56 2003
+++ Releases/Zope/lib/python/ZTUtils/Tree.py	Thu Dec 11 13:02:15 2003
@@ -277,16 +277,19 @@
             result = zresult
     return result
 
-def decodeExpansion(s, nth=None):
+def decodeExpansion(s, nth=None, maxsize=8192):
     '''Decode an expanded node map from a string.
 
     If nth is an integer, also return the (map, key) pair for the nth entry.
     '''
-    if len(s) > 8192: # Set limit to 8K, to avoid DoS attacks.
+    if len(s) > maxsize: # Set limit to avoid DoS attacks.
         raise ValueError('Encoded node map too large')
 
     if s[0] == ':': # Compressed state
-        s = zlib.decompress(a2b(s[1:]))
+        dec = zlib.decompressobj()
+        s = dec.decompress(a2b(s[1:]), maxsize)
+        if dec.decompress('', 1):
+            raise ValueError('Encoded node map too large')
     
     map = m = {}
     mstack = []



From evan at 4-am.com  Thu Dec 11 13:03:57 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/ZTUtils - Tree.py:1.15.2.3
Message-ID: <200312111803.hBBI3vto011504@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_7-branch
	Tree.py 
Log Message:
Collector #1012: A carefully crafted compressed tree state could violate size limit.  Limit is no longer hardcoded.


=== Releases/Zope/lib/python/ZTUtils/Tree.py 1.15.2.2 => 1.15.2.3 ===
--- Releases/Zope/lib/python/ZTUtils/Tree.py:1.15.2.2	Mon Jul 21 12:37:40 2003
+++ Releases/Zope/lib/python/ZTUtils/Tree.py	Thu Dec 11 13:03:56 2003
@@ -277,16 +277,19 @@
             result = zresult
     return result
 
-def decodeExpansion(s, nth=None):
+def decodeExpansion(s, nth=None, maxsize=8192):
     '''Decode an expanded node map from a string.
 
     If nth is an integer, also return the (map, key) pair for the nth entry.
     '''
-    if len(s) > 8192: # Set limit to 8K, to avoid DoS attacks.
+    if len(s) > maxsize: # Set limit to avoid DoS attacks.
         raise ValueError('Encoded node map too large')
 
     if s[0] == ':': # Compressed state
-        s = zlib.decompress(a2b(s[1:]))
+        dec = zlib.decompressobj()
+        s = dec.decompress(a2b(s[1:]), maxsize)
+        if dec.decompress('', 1):
+            raise ValueError('Encoded node map too large')
     
     map = m = {}
     mstack = []



From zen at shangri-la.dropbear.id.au  Sat Dec 13 01:06:42 2003
From: zen at shangri-la.dropbear.id.au (Stuart Bishop)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests -
	test_ptfile.py:1.2.32.1
Message-ID: <200312130606.hBD66gj3003090@cvs.zope.org>

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

Modified Files:
      Tag: zen-fix__name__-branch
	test_ptfile.py 
Log Message:
Added getId() to Item_w__name__, since the one inherited from Item
has broken __name__ handling.

PageTemplateFile now using Item_w__name__ mixin, making getId()
and absolute_url() actually work.


=== Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py 1.2 => 1.2.32.1 ===
--- Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py:1.2	Tue Apr 22 12:16:36 2003
+++ Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py	Sat Dec 13 01:06:41 2003
@@ -1,6 +1,6 @@
 """Tests of PageTemplateFile."""
 
-import os
+import os, os.path
 import tempfile
 import unittest
 
@@ -118,6 +118,33 @@
         self.check_content_type("<doc><element/></doc>",
                                 "text/xml")
 
+    def test_getId(self):
+        desired_id = os.path.splitext(os.path.split(self.TEMPFILENAME)[-1])[0]
+        f = open(self.TEMPFILENAME, 'w')
+        print >> f, 'Boring'
+        f.close()
+        pt = PageTemplateFile(self.TEMPFILENAME)
+        pt_id = pt.getId()
+        self.failUnlessEqual(
+                pt_id, desired_id,
+                'getId() returned %r. Expecting %r' % (pt_id, desired_id)
+                )
+
+    def test_getPhysicalPath(self):
+        desired_id = os.path.splitext(os.path.split(self.TEMPFILENAME)[-1])[0]
+        desired_path = (desired_id,)
+        f = open(self.TEMPFILENAME, 'w')
+        print >> f, 'Boring'
+        f.close()
+        pt = PageTemplateFile(self.TEMPFILENAME)
+        pt_path = pt.getPhysicalPath()
+        self.failUnlessEqual(
+                pt_path, desired_path,
+                'getPhysicalPath() returned %r. Expecting %r' % (
+                    desired_path, pt_path,
+                    )
+                )
+ 
 
 def test_suite():
     return unittest.makeSuite(TypeSniffingTestCase)



From zen at shangri-la.dropbear.id.au  Sat Dec 13 01:07:12 2003
From: zen at shangri-la.dropbear.id.au (Stuart Bishop)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates -
	PageTemplateFile.py:1.29.14.1
Message-ID: <200312130607.hBD67CTI003256@cvs.zope.org>

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

Modified Files:
      Tag: zen-fix__name__-branch
	PageTemplateFile.py 
Log Message:
Added getId() to Item_w__name__, since the one inherited from Item
has broken __name__ handling.

PageTemplateFile now using Item_w__name__ mixin, making getId()
and absolute_url() actually work.


=== Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.29 => 1.29.14.1 ===
--- Zope/lib/python/Products/PageTemplates/PageTemplateFile.py:1.29	Sat Oct  4 14:56:58 2003
+++ Zope/lib/python/Products/PageTemplates/PageTemplateFile.py	Sat Dec 13 01:06:41 2003
@@ -29,8 +29,9 @@
 from ComputedAttribute import ComputedAttribute
 from Acquisition import aq_parent, aq_inner
 from App.config import getConfiguration
+from OFS.SimpleItem import Item_w__name__
 
-class PageTemplateFile(Script, PageTemplate, Traversable):
+class PageTemplateFile(Item_w__name__, Script, PageTemplate, Traversable):
     "Zope wrapper for filesystem Page Template using TAL, TALES, and METAL"
 
     meta_type = 'Page Template (File)'



From zen at shangri-la.dropbear.id.au  Sat Dec 13 02:57:51 2003
From: zen at shangri-la.dropbear.id.au (Stuart Bishop)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests -
	test_ptfile.py:1.3
Message-ID: <200312130757.hBD7vpuC022380@cvs.zope.org>

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

Modified Files:
	test_ptfile.py 
Log Message:
Merging to HEAD

Added getId() to Item_w__name__, since the one inherited from Item
has broken __name__ handling.

PageTemplateFile now using Item_w__name__ mixin, making getId()
and absolute_url() actually work.



=== Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py 1.2 => 1.3 ===
--- Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py:1.2	Tue Apr 22 12:16:36 2003
+++ Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py	Sat Dec 13 02:57:50 2003
@@ -1,6 +1,6 @@
 """Tests of PageTemplateFile."""
 
-import os
+import os, os.path
 import tempfile
 import unittest
 
@@ -118,6 +118,33 @@
         self.check_content_type("<doc><element/></doc>",
                                 "text/xml")
 
+    def test_getId(self):
+        desired_id = os.path.splitext(os.path.split(self.TEMPFILENAME)[-1])[0]
+        f = open(self.TEMPFILENAME, 'w')
+        print >> f, 'Boring'
+        f.close()
+        pt = PageTemplateFile(self.TEMPFILENAME)
+        pt_id = pt.getId()
+        self.failUnlessEqual(
+                pt_id, desired_id,
+                'getId() returned %r. Expecting %r' % (pt_id, desired_id)
+                )
+
+    def test_getPhysicalPath(self):
+        desired_id = os.path.splitext(os.path.split(self.TEMPFILENAME)[-1])[0]
+        desired_path = (desired_id,)
+        f = open(self.TEMPFILENAME, 'w')
+        print >> f, 'Boring'
+        f.close()
+        pt = PageTemplateFile(self.TEMPFILENAME)
+        pt_path = pt.getPhysicalPath()
+        self.failUnlessEqual(
+                pt_path, desired_path,
+                'getPhysicalPath() returned %r. Expecting %r' % (
+                    desired_path, pt_path,
+                    )
+                )
+ 
 
 def test_suite():
     return unittest.makeSuite(TypeSniffingTestCase)



From zen at shangri-la.dropbear.id.au  Sat Dec 13 02:58:21 2003
From: zen at shangri-la.dropbear.id.au (Stuart Bishop)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates -
	PageTemplateFile.py:1.30
Message-ID: <200312130758.hBD7wKI7022553@cvs.zope.org>

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

Modified Files:
	PageTemplateFile.py 
Log Message:
Merging to HEAD

Added getId() to Item_w__name__, since the one inherited from Item
has broken __name__ handling.

PageTemplateFile now using Item_w__name__ mixin, making getId()
and absolute_url() actually work.



=== Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.29 => 1.30 ===
--- Zope/lib/python/Products/PageTemplates/PageTemplateFile.py:1.29	Sat Oct  4 14:56:58 2003
+++ Zope/lib/python/Products/PageTemplates/PageTemplateFile.py	Sat Dec 13 02:57:50 2003
@@ -29,8 +29,9 @@
 from ComputedAttribute import ComputedAttribute
 from Acquisition import aq_parent, aq_inner
 from App.config import getConfiguration
+from OFS.SimpleItem import Item_w__name__
 
-class PageTemplateFile(Script, PageTemplate, Traversable):
+class PageTemplateFile(Item_w__name__, Script, PageTemplate, Traversable):
     "Zope wrapper for filesystem Page Template using TAL, TALES, and METAL"
 
     meta_type = 'Page Template (File)'



From zen at shangri-la.dropbear.id.au  Tue Dec 16 09:50:16 2003
From: zen at shangri-la.dropbear.id.au (Stuart Bishop)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests -
	test_ptfile.py:1.2.4.1
Message-ID: <200312161450.hBGEoGGF025238@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_7-branch
	test_ptfile.py 
Log Message:
Merged into branch

Added getId() to Item_w__name__, since the one inherited from Item
has broken __name__ handling.

PageTemplateFile now using Item_w__name__ mixin, making getId()
and absolute_url() actually work.



=== Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py 1.2 => 1.2.4.1 ===
--- Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py:1.2	Tue Apr 22 12:16:36 2003
+++ Zope/lib/python/Products/PageTemplates/tests/test_ptfile.py	Tue Dec 16 09:50:14 2003
@@ -1,6 +1,6 @@
 """Tests of PageTemplateFile."""
 
-import os
+import os, os.path
 import tempfile
 import unittest
 
@@ -118,6 +118,33 @@
         self.check_content_type("<doc><element/></doc>",
                                 "text/xml")
 
+    def test_getId(self):
+        desired_id = os.path.splitext(os.path.split(self.TEMPFILENAME)[-1])[0]
+        f = open(self.TEMPFILENAME, 'w')
+        print >> f, 'Boring'
+        f.close()
+        pt = PageTemplateFile(self.TEMPFILENAME)
+        pt_id = pt.getId()
+        self.failUnlessEqual(
+                pt_id, desired_id,
+                'getId() returned %r. Expecting %r' % (pt_id, desired_id)
+                )
+
+    def test_getPhysicalPath(self):
+        desired_id = os.path.splitext(os.path.split(self.TEMPFILENAME)[-1])[0]
+        desired_path = (desired_id,)
+        f = open(self.TEMPFILENAME, 'w')
+        print >> f, 'Boring'
+        f.close()
+        pt = PageTemplateFile(self.TEMPFILENAME)
+        pt_path = pt.getPhysicalPath()
+        self.failUnlessEqual(
+                pt_path, desired_path,
+                'getPhysicalPath() returned %r. Expecting %r' % (
+                    desired_path, pt_path,
+                    )
+                )
+ 
 
 def test_suite():
     return unittest.makeSuite(TypeSniffingTestCase)



From zen at shangri-la.dropbear.id.au  Tue Dec 16 09:50:46 2003
From: zen at shangri-la.dropbear.id.au (Stuart Bishop)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates -
	PageTemplateFile.py:1.28.4.2
Message-ID: <200312161450.hBGEokl0025259@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_7-branch
	PageTemplateFile.py 
Log Message:
Merged into branch

Added getId() to Item_w__name__, since the one inherited from Item
has broken __name__ handling.

PageTemplateFile now using Item_w__name__ mixin, making getId()
and absolute_url() actually work.



=== Zope/lib/python/Products/PageTemplates/PageTemplateFile.py 1.28.4.1 => 1.28.4.2 ===
--- Zope/lib/python/Products/PageTemplates/PageTemplateFile.py:1.28.4.1	Sat Oct  4 14:57:57 2003
+++ Zope/lib/python/Products/PageTemplates/PageTemplateFile.py	Tue Dec 16 09:50:13 2003
@@ -29,8 +29,9 @@
 from ComputedAttribute import ComputedAttribute
 from Acquisition import aq_parent, aq_inner
 from App.config import getConfiguration
+from OFS.SimpleItem import Item_w__name__
 
-class PageTemplateFile(Script, PageTemplate, Traversable):
+class PageTemplateFile(Item_w__name__, Script, PageTemplate, Traversable):
     "Zope wrapper for filesystem Page Template using TAL, TALES, and METAL"
 
     meta_type = 'Page Template (File)'



From tseaver at zope.com  Fri Dec 19 12:26:29 2003
From: tseaver at zope.com (Tres Seaver)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests/input -
	StringExpression.html:1.1.114.2
Message-ID: <200312191726.hBJHQT4S003350@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_6-branch
	StringExpression.html 
Log Message:


  Backport assorted fixes for running Zope 2.6.x tests under Python 2.3.

  - lib/python/Products/PluginIndexes/DateIndex:

    o Deal with the fact that in Python 2.3, int can return a long
      instead of throwing OverflowError.

  - lib/python/Products/PageTemplates/tests:

    o 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 Python releases.

  The following now shows 1781 tests passing, albeit with a number of
  PendingDeprecationWarnings::

    $ python2.3 utilities/testrunner.py -a -v


=== Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html 1.1.114.1 => 1.1.114.2 ===
--- Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html:1.1.114.1	Tue Oct  1 11:54:25 2002
+++ Zope/lib/python/Products/PageTemplates/tests/input/StringExpression.html	Fri Dec 19 12:25:58 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 tseaver at zope.com  Fri Dec 19 12:26:30 2003
From: tseaver at zope.com (Tres Seaver)
Date: Sun Aug 10 17:05:19 2008
Subject: [ZPT-CVS] CVS: Zope/lib/python/Products/PageTemplates/tests/output
	- StringExpression.html:1.2.114.2
Message-ID: <200312191726.hBJHQUTv003361@cvs.zope.org>

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

Modified Files:
      Tag: Zope-2_6-branch
	StringExpression.html 
Log Message:


  Backport assorted fixes for running Zope 2.6.x tests under Python 2.3.

  - lib/python/Products/PluginIndexes/DateIndex:

    o Deal with the fact that in Python 2.3, int can return a long
      instead of throwing OverflowError.

  - lib/python/Products/PageTemplates/tests:

    o 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 Python releases.

  The following now shows 1781 tests passing, albeit with a number of
  PendingDeprecationWarnings::

    $ python2.3 utilities/testrunner.py -a -v


=== Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html 1.2.114.1 => 1.2.114.2 ===
--- Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html:1.2.114.1	Tue Oct  1 11:54:26 2002
+++ Zope/lib/python/Products/PageTemplates/tests/output/StringExpression.html	Fri Dec 19 12:25:59 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>