[Checkins] SVN: z3c.form/trunk/ - Bug: Display Widgets added spaces (due to code indentation) to the displayed

Stephan Richter srichter at cosmos.phy.tufts.edu
Thu Apr 24 21:20:12 EDT 2008


Log message for revision 85711:
  - Bug: Display Widgets added spaces (due to code indentation) to the displayed
    values, which in some cases, like when displaying Python source code, caused
    the appearance to be incorrect.
  
  

Changed:
  U   z3c.form/trunk/CHANGES.txt
  U   z3c.form/trunk/setup.py
  U   z3c.form/trunk/src/z3c/form/browser/README.txt
  U   z3c.form/trunk/src/z3c/form/browser/checkbox_display.pt
  U   z3c.form/trunk/src/z3c/form/browser/file_display.pt
  U   z3c.form/trunk/src/z3c/form/browser/orderedselect_display.pt
  U   z3c.form/trunk/src/z3c/form/browser/password_display.pt
  U   z3c.form/trunk/src/z3c/form/browser/radio_display.pt
  U   z3c.form/trunk/src/z3c/form/browser/select_display.pt
  U   z3c.form/trunk/src/z3c/form/browser/text_display.pt
  U   z3c.form/trunk/src/z3c/form/browser/textarea_display.pt
  U   z3c.form/trunk/src/z3c/form/form.txt

-=-
Modified: z3c.form/trunk/CHANGES.txt
===================================================================
--- z3c.form/trunk/CHANGES.txt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/CHANGES.txt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -2,14 +2,18 @@
 CHANGES
 =======
 
-Version 1.8.2dev (unreleased)
------------------------------
+Version 1.8.2 (2008-04-24)
+--------------------------
 
-- Bug: Prevent to call __len__ on ITerms and use ``is None`` for check for 
-  existence. Because __len__ is not a part of the ITerms API and 
-  ``not widget.terms`` will end in calling __len__ on existing terms.
+- Bug: Display Widgets added spaces (due to code indentation) to the displayed
+  values, which in some cases, like when displaying Python source code, caused
+  the appearance to be incorrect.
 
+- Bug: Prevent to call ``__len__`` on ``ITerms`` and use ``is None`` for check
+  for existence. Because ``__len__`` is not a part of the ITerms API and ``not
+  widget.terms`` will end in calling ``__len__`` on existing terms.
 
+
 Version 1.8.1 (2008-04-08)
 --------------------------
 

Modified: z3c.form/trunk/setup.py
===================================================================
--- z3c.form/trunk/setup.py	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/setup.py	2008-04-25 01:20:11 UTC (rev 85711)
@@ -44,7 +44,7 @@
 
 setup (
     name='z3c.form',
-    version='1.8.2dev',
+    version='1.8.2',
     author = "Stephan Richter, Roger Ineichen and the Zope Community",
     author_email = "zope-dev at zope.org",
     description = "An advanced form and widget framework for Zope 3",

Modified: z3c.form/trunk/src/z3c/form/browser/README.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/README.txt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/README.txt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -50,10 +50,8 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="textarea-widget required ascii-field">
-    This is
-   ASCII.
-  </span>
+  <span id="foo" class="textarea-widget required ascii-field">This is
+   ASCII.</span>
 
 
 ASCIILine
@@ -68,9 +66,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required asciiline-field">
-    An ASCII line.
-  </span>
+  <span id="foo" class="text-widget required asciiline-field">An ASCII line.</span>
 
 Bool
 ----
@@ -97,9 +93,8 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="radio-widget required bool-field">
-    <span class="selected-option">yes</span>
-  </span>
+  <span id="foo" class="radio-widget required bool-field"><span
+      class="selected-option">yes</span></span>
 
 For the boolean, the checkbox widget can be used as well:
 
@@ -128,9 +123,8 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="checkbox-widget required bool-field">
-    <span class="selected-option">yes</span>
-  </span>
+  <span id="foo" class="checkbox-widget required bool-field"><span
+      class="selected-option">yes</span></span>
 
 We can also have a sinle checkbox button for the boolean.
 
@@ -153,9 +147,8 @@
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
   <span id="foo"
-        class="single-checkbox-widget required bool-field">
-    <span class="selected-option"></span>
-  </span>
+        class="single-checkbox-widget required bool-field"><span
+      class="selected-option"></span></span>
 
 
 Button
@@ -206,7 +199,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> widget.render()
-  u'<span id="foo" class="file-widget required bytes-field">\n  \x08%\n\x1a\n</span>\n'
+  u'<span id="foo" class="file-widget required bytes-field">\x08%\n\x1a</span>\n'
 
 
 BytesLine
@@ -221,9 +214,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required bytesline-field">
-    A Bytes line.
-  </span>
+  <span id="foo" class="text-widget required bytesline-field">A Bytes line.</span>
 
 
 Choice
@@ -246,9 +237,8 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="select-widget required choice-field">
-    <span class="selected-option">Yes</span>
-  </span>
+  <span id="foo" class="select-widget required choice-field"><span
+    class="selected-option">Yes</span></span>
 
 
 Date
@@ -264,9 +254,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required date-field">
-    07/04/01
-  </span>
+  <span id="foo" class="text-widget required date-field">07/04/01</span>
 
 
 Datetime
@@ -281,9 +269,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required datetime-field">
-    07/04/01 12:00
-  </span>
+  <span id="foo" class="text-widget required datetime-field">07/04/01 12:00</span>
 
 
 Decimal
@@ -299,9 +285,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required decimal-field">
-    1,265.87
-  </span>
+  <span id="foo" class="text-widget required decimal-field">1,265.87</span>
 
 
 Dict
@@ -323,9 +307,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required dottedname-field">
-    z3c.form
-  </span>
+  <span id="foo" class="text-widget required dottedname-field">z3c.form</span>
 
 
 Float
@@ -340,9 +322,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required float-field">
-    1,265.8
-  </span>
+  <span id="foo" class="text-widget required float-field">1,265.8</span>
 
 
 FrozenSet
@@ -365,10 +345,9 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="select-widget required frozenset-field">
-    <span class="selected-option">1</span>,
-    <span class="selected-option">3</span>
-  </span>
+  <span id="foo" class="select-widget required frozenset-field"><span
+    class="selected-option">1</span>, <span
+    class="selected-option">3</span></span>
 
 
 Id
@@ -383,9 +362,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required id-field">
-    z3c.form
-  </span>
+  <span id="foo" class="text-widget required id-field">z3c.form</span>
 
 
 ImageButton
@@ -449,9 +426,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required int-field">
-    1,200
-  </span>
+  <span id="foo" class="text-widget required int-field">1,200</span>
 
 
 List
@@ -471,7 +446,7 @@
     <tr>
       <td>
         <select id="foo-from" name="bar.from" size="5"
-                multiple="multiple" 
+                multiple="multiple"
                 class="required list-field">
           <option value="2">2</option>
           <option value="4">4</option>
@@ -510,10 +485,9 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="required list-field">
-    <span class="selected-option">1</span>,
-    <span class="selected-option">3</span>
-  </span>
+  <span id="foo" class="required list-field"><span
+      class="selected-option">1</span>, <span
+      class="selected-option">3</span></span>
 
 
 Object
@@ -535,9 +509,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="password-widget required password-field">
-    mypwd
-  </span>
+  <span id="foo" class="password-widget required password-field">mypwd</span>
 
 
 Set
@@ -560,10 +532,9 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="select-widget required set-field">
-    <span class="selected-option">1</span>,
-    <span class="selected-option">3</span>
-  </span>
+  <span id="foo" class="select-widget required set-field"><span
+      class="selected-option">1</span>, <span
+      class="selected-option">3</span></span>
 
 
 SourceText
@@ -578,9 +549,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="textarea-widget required sourcetext-field">
-    &lt;source /&gt;
-  </span>
+  <span id="foo" class="textarea-widget required sourcetext-field">&lt;source /&gt;</span>
 
 
 Text
@@ -595,10 +564,8 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="textarea-widget required text-field">
-    Some
-    Text.
-  </span>
+  <span id="foo" class="textarea-widget required text-field">Some
+    Text.</span>
 
 
 TextLine
@@ -613,9 +580,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required textline-field">
-    Some Text line.
-  </span>
+  <span id="foo" class="text-widget required textline-field">Some Text line.</span>
 
 
 Time
@@ -630,9 +595,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required time-field">
-    12:00
-  </span>
+  <span id="foo" class="text-widget required time-field">12:00</span>
 
 
 Timedelta
@@ -647,9 +610,7 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required timedelta-field">
-    3 days, 0:00:00
-  </span>
+  <span id="foo" class="text-widget required timedelta-field">3 days, 0:00:00</span>
 
 
 Tuple
@@ -669,7 +630,7 @@
     <tr>
       <td>
         <select id="foo-from" name="bar.from" size="5"
-                multiple="multiple" 
+                multiple="multiple"
                 class="required tuple-field">
           <option value="2">2</option>
           <option value="4">4</option>
@@ -708,10 +669,9 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="required tuple-field">
-    <span class="selected-option">1</span>,
-    <span class="selected-option">3</span>
-  </span>
+  <span id="foo" class="required tuple-field"><span
+    class="selected-option">1</span>, <span
+    class="selected-option">3</span></span>
 
 
 URI
@@ -726,6 +686,4 @@
 
   >>> widget.mode = interfaces.DISPLAY_MODE
   >>> print widget.render()
-  <span id="foo" class="text-widget required uri-field">
-    http://zope.org
-  </span>
+  <span id="foo" class="text-widget required uri-field">http://zope.org</span>

Modified: z3c.form/trunk/src/z3c/form/browser/checkbox_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/checkbox_display.pt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/checkbox_display.pt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -12,10 +12,10 @@
                       onmouseout view/onmouseout;
                       onkeypress view/onkeypress;
                       onkeydown view/onkeydown;
-                      onkeyup view/onkeyup">
-  <tal:block tal:repeat="value view/displayValue"
+                      onkeyup view/onkeyup"><tal:block
+    tal:repeat="value view/displayValue"
     ><span class="selected-option"
            tal:content="value"
     /><tal:block condition="not:repeat/value/end">, </tal:block
-  ></tal:block>
-</span>
+  ></tal:block
+></span>

Modified: z3c.form/trunk/src/z3c/form/browser/file_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/file_display.pt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/file_display.pt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -12,6 +12,6 @@
                       onmouseout view/onmouseout;
                       onkeypress view/onkeypress;
                       onkeydown view/onkeydown;
-                      onkeyup view/onkeyup">
-  <tal:block condition="view/value" content="view/value" />
-</span>
+                      onkeyup view/onkeyup"><tal:block
+      condition="view/value" content="view/value"
+/></span>

Modified: z3c.form/trunk/src/z3c/form/browser/orderedselect_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/orderedselect_display.pt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/orderedselect_display.pt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -12,10 +12,10 @@
                       onmouseout view/onmouseout;
                       onkeypress view/onkeypress;
                       onkeydown view/onkeydown;
-                      onkeyup view/onkeyup">
-  <tal:block tal:repeat="value view/displayValue"
+                      onkeyup view/onkeyup"><tal:block
+    tal:repeat="value view/displayValue"
     ><span class="selected-option"
            tal:content="value"
     /><tal:block condition="not:repeat/value/end">, </tal:block
-  ></tal:block>
-</span>
+  ></tal:block
+></span>

Modified: z3c.form/trunk/src/z3c/form/browser/password_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/password_display.pt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/password_display.pt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -12,6 +12,6 @@
                       onmouseout view/onmouseout;
                       onkeypress view/onkeypress;
                       onkeydown view/onkeydown;
-                      onkeyup view/onkeyup">
-  <tal:block condition="view/value" content="view/value" />
-</span>
+                      onkeyup view/onkeyup"><tal:block
+      condition="view/value" content="view/value"
+/></span>

Modified: z3c.form/trunk/src/z3c/form/browser/radio_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/radio_display.pt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/radio_display.pt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -12,10 +12,10 @@
                       onmouseout view/onmouseout;
                       onkeypress view/onkeypress;
                       onkeydown view/onkeydown;
-                      onkeyup view/onkeyup">
-  <tal:block tal:repeat="value view/displayValue"
+                      onkeyup view/onkeyup"><tal:block
+    tal:repeat="value view/displayValue"
     ><span class="selected-option"
            tal:content="value"
     /><tal:block condition="not:repeat/value/end">, </tal:block
-  ></tal:block>
-</span>
+  ></tal:block
+></span>

Modified: z3c.form/trunk/src/z3c/form/browser/select_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/select_display.pt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/select_display.pt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -12,10 +12,10 @@
                       onmouseout view/onmouseout;
                       onkeypress view/onkeypress;
                       onkeydown view/onkeydown;
-                      onkeyup view/onkeyup">
-  <tal:block tal:repeat="value view/displayValue"
+                      onkeyup view/onkeyup"><tal:block
+    tal:repeat="value view/displayValue"
     ><span class="selected-option"
            tal:content="value"
     /><tal:block condition="not:repeat/value/end">, </tal:block
-  ></tal:block>
-</span>
+  ></tal:block
+></span>

Modified: z3c.form/trunk/src/z3c/form/browser/text_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/text_display.pt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/text_display.pt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -12,6 +12,6 @@
                       onmouseout view/onmouseout;
                       onkeypress view/onkeypress;
                       onkeydown view/onkeydown;
-                      onkeyup view/onkeyup">
-  <tal:block condition="view/value" content="view/value" />
-</span>
+                      onkeyup view/onkeyup"><tal:block
+      condition="view/value" content="view/value"
+/></span>

Modified: z3c.form/trunk/src/z3c/form/browser/textarea_display.pt
===================================================================
--- z3c.form/trunk/src/z3c/form/browser/textarea_display.pt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/browser/textarea_display.pt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -12,6 +12,6 @@
                       onmouseout view/onmouseout;
                       onkeypress view/onkeypress;
                       onkeydown view/onkeydown;
-                      onkeyup view/onkeyup">
-  <tal:block condition="view/value" content="view/value" />
-</span>
+                      onkeyup view/onkeyup"><tal:block
+      condition="view/value" content="view/value"
+/></span>

Modified: z3c.form/trunk/src/z3c/form/form.txt
===================================================================
--- z3c.form/trunk/src/z3c/form/form.txt	2008-04-25 00:43:01 UTC (rev 85710)
+++ z3c.form/trunk/src/z3c/form/form.txt	2008-04-25 01:20:11 UTC (rev 85711)
@@ -752,9 +752,7 @@
         <div class="row">
             <label for="form-widgets-id">ID</label>
             <span id="form-widgets-id"
-                  class="text-widget required textline-field">
-              srichter
-            </span>
+                  class="text-widget required textline-field">srichter</span>
         </div>
         <div class="row">
           <label for="form-widgets-name">Full Name</label>
@@ -820,9 +818,7 @@
         <div class="row">
             <label for="form-widgets-id">ID</label>
             <span id="form-widgets-id"
-                  class="text-widget required textline-field">
-              srichter
-            </span>
+                  class="text-widget required textline-field">srichter</span>
         </div>
         <div class="row">
           <label for="form-widgets-name">Full Name</label>
@@ -1010,9 +1006,7 @@
         <div class="row">
           <label for="form-widgets-id">ID</label>
           <span id="form-widgets-id"
-                class="text-widget required textline-field">
-            rineichen
-          </span>
+                class="text-widget required textline-field">rineichen</span>
         </div>
         <div class="row">
           <label for="form-widgets-name">Full Name</label>
@@ -1085,26 +1079,20 @@
   <html>
     <body>
       <div class="row">
-        <span id="form-widgets-id" class="text-widget required textline-field">
-          srichter
-        </span>
+        <span id="form-widgets-id"
+              class="text-widget required textline-field">srichter</span>
       </div>
       <div class="row">
         <span id="form-widgets-name"
-              class="text-widget required textline-field">
-          Claudia Richter
-        </span>
+              class="text-widget required textline-field">Claudia Richter</span>
       </div>
       <div class="row">
         <span id="form-widgets-gender"
-              class="select-widget choice-field">
-          <span class="selected-option">female</span>
-        </span>
+              class="select-widget choice-field"><span
+            class="selected-option">female</span></span>
       </div>
       <div class="row">
-        <span id="form-widgets-age" class="text-widget int-field">
-          29
-        </span>
+        <span id="form-widgets-age" class="text-widget int-field">29</span>
       </div>
     </body>
   </html>



More information about the Checkins mailing list