[ZPT] CVS: Zope/lib/python/Products/PageTemplates - TALES.py:1.29.18.1 ZopePageTemplate.py:1.38.10.1

[Matt Behrens]

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

Modified Files:
      Tag: zigg_unix-install-control-config-branch
	TALES.py ZopePageTemplate.py 
Log Message:
Merge in HEAD (except setup.py... gotta chat about that one) :-)


=== Zope/lib/python/Products/PageTemplates/TALES.py 1.29 => 1.29.18.1 ===
 class Default:
     '''Retain Default'''
-    def __nonzero__(self):
-        return 0
 Default = Default()
 
 _marker = []


=== Zope/lib/python/Products/PageTemplates/ZopePageTemplate.py 1.38 => 1.38.10.1 ===
                        dtpref_cols='50', dtpref_rows='20'):
         """Change editing preferences."""
+        # The <textarea> can have dimensions expressed in percentages;
+        # strip the percent sign so int() below won't fail
+        if dtpref_cols[-1:] == "%":
+            dtpref_cols = dtpref_cols[:-1] or '50'
+        if dtpref_rows[-1:] == "%":
+            dtpref_rows = dtpref_rows[:-1] or '20'
         szchh = {'Taller': 1, 'Shorter': -1, None: 0}
         szchw = {'Wider': 5, 'Narrower': -5, None: 0}
         try: rows = int(height)