[Checkins] SVN: zope.tal/trunk/ Increase the default value of the `wrap` argument from 60 to 1023 characters, to avoid extra whitespace and line breaks.

Sat Aug 20 11:58:21 EDT 2011

Log message for revision 122627:
  Increase the default value of the `wrap` argument from 60 to 1023 characters, to avoid extra whitespace and line breaks.
  

Changed:
  U   zope.tal/trunk/CHANGES.txt
  U   zope.tal/trunk/setup.py
  U   zope.tal/trunk/src/zope/tal/talinterpreter.py
  U   zope.tal/trunk/src/zope/tal/tests/output/acme_template_source.html

-=-
Modified: zope.tal/trunk/CHANGES.txt
===================================================================

--- zope.tal/trunk/CHANGES.txt	2011-08-20 15:49:42 UTC (rev 122626)
+++ zope.tal/trunk/CHANGES.txt	2011-08-20 15:58:20 UTC (rev 122627)
@@ -2,9 +2,12 @@
 CHANGES
 =======
 
-3.5.3 (unreleased)
+3.6.0 (unreleased)
 ------------------
 
+- Increase the default value of the `wrap` argument from 60 to 1023 characters,
+  to avoid extra whitespace and line breaks.
+
 - Fix printing of error messages for msgid conflict with non-ASCII texts.
 
 

Modified: zope.tal/trunk/setup.py
===================================================================
--- zope.tal/trunk/setup.py	2011-08-20 15:49:42 UTC (rev 122626)
+++ zope.tal/trunk/setup.py	2011-08-20 15:58:20 UTC (rev 122627)
@@ -44,7 +44,7 @@
     return TestSuite(suites)
 
 setup(name='zope.tal',
-      version = '3.5.3dev',
+      version = '3.6.0dev',
       author='Zope Foundation and Contributors',
       author_email='zope-dev at zope.org',
       description='Zope 3 Template Application Languate (TAL)',
@@ -53,7 +53,7 @@
           + '\n\n' +
           read('CHANGES.txt')
           ),
-      keywords = "zope3 template xml tal",
+      keywords = "zope template xml tal",
       classifiers = [
           'Development Status :: 5 - Production/Stable',
           'Environment :: Web Environment',

Modified: zope.tal/trunk/src/zope/tal/talinterpreter.py
===================================================================
--- zope.tal/trunk/src/zope/tal/talinterpreter.py	2011-08-20 15:49:42 UTC (rev 122626)
+++ zope.tal/trunk/src/zope/tal/talinterpreter.py	2011-08-20 15:58:20 UTC (rev 122627)
@@ -141,7 +141,7 @@
     """
 
     def __init__(self, program, macros, engine, stream=None,
-                 debug=0, wrap=60, metal=1, tal=1, showtal=-1,
+                 debug=0, wrap=1023, metal=1, tal=1, showtal=-1,
                  strictinsert=1, stackLimit=100, i18nInterpolate=1,
                  sourceAnnotations=0):
         """Create a TAL interpreter.
@@ -153,7 +153,7 @@
             debug -- enable debugging output to sys.stderr (off by default).
 
             wrap -- try to wrap attributes on opening tags to this number of
-            column (default: 60).
+            column (default: 1023).
 
             metal -- enable METAL macro processing (on by default).
 

Modified: zope.tal/trunk/src/zope/tal/tests/output/acme_template_source.html
===================================================================
--- zope.tal/trunk/src/zope/tal/tests/output/acme_template_source.html	2011-08-20 15:49:42 UTC (rev 122626)
+++ zope.tal/trunk/src/zope/tal/tests/output/acme_template_source.html	2011-08-20 15:58:20 UTC (rev 122627)
@@ -1,7 +1,6 @@
 <!-- This is ACME's generic look and feel, which is based on
 PNOME's look and feel. -->
-<html metal:define-macro="page"
-      metal:use-macro="pnome_macros_page">
+<html metal:define-macro="page" metal:use-macro="pnome_macros_page">
 <head>
 <title metal:fill-slot="title">ACME Look and Feel</title>
 <metal:block>

